From 8917cf5e44af1562114fe0d243dcea7d187c8047 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Jul 2013 01:15:53 -0700 Subject: Tue Jul 2 01:15:53 PDT 2013 --- community/libvirt/PKGBUILD | 8 +- community/marisa/ChangeLog | 10 + community/marisa/PKGBUILD | 109 +++++ community/recorditnow/PKGBUILD | 13 +- community/rekonq/PKGBUILD | 6 +- community/sakura/PKGBUILD | 6 +- community/xjadeo/PKGBUILD | 42 ++ community/xjadeo/qjadeo.desktop | 8 + community/xjadeo/xjadeo.install | 11 + extra/cfitsio/PKGBUILD | 6 +- extra/clutter-gtk/PKGBUILD | 15 +- ...lutter_x11_set_use_argb_visual-on-non-X11.patch | 29 ++ extra/giflib/PKGBUILD | 6 +- extra/giflib/giflib-4.2.1-quantize.patch | 465 ++++++++++++++++----- ...forgiving-when-calling-get_theme_node-on-.patch | 37 -- extra/gnome-shell/PKGBUILD | 12 +- extra/gnome-shell/git-fixes.patch | 125 ++++++ extra/lcms2/PKGBUILD | 12 +- extra/libsecret/PKGBUILD | 3 +- extra/openmpi/PKGBUILD | 17 +- ...-Fix-compilation-under-threaded-bleadperl.patch | 32 -- ...7.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch | 47 --- extra/perl-tk/PKGBUILD | 35 +- extra/soprano/PKGBUILD | 11 +- extra/uim/PKGBUILD | 8 +- extra/xorg-server/PKGBUILD | 46 +- .../fb-rename-wfbDestroyGlyphCache.patch | 27 ++ extra/xorg-server/git-fixes.patch | 27 -- extra/xorg-server/xephyr-glx.patch | 39 ++ libre/icedove-l10n/PKGBUILD | 114 ++--- libre/icedove-libre/PKGBUILD | 12 +- 31 files changed, 939 insertions(+), 399 deletions(-) create mode 100644 community/marisa/ChangeLog create mode 100644 community/marisa/PKGBUILD create mode 100644 community/xjadeo/PKGBUILD create mode 100644 community/xjadeo/qjadeo.desktop create mode 100644 community/xjadeo/xjadeo.install create mode 100644 extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch delete mode 100644 extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch create mode 100644 extra/gnome-shell/git-fixes.patch delete mode 100644 extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch delete mode 100644 extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch create mode 100644 extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch delete mode 100644 extra/xorg-server/git-fixes.patch create mode 100644 extra/xorg-server/xephyr-glx.patch diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 8e2bb92fe..3e4c3b6f8 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92992 2013-06-21 11:27:42Z spupykin $ +# $Id: PKGBUILD 93317 2013-07-01 14:35:45Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt -pkgver=1.0.6 -pkgrel=3 +pkgver=1.1.0 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -34,7 +34,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d libvirt.tmpfiles.d) -md5sums=('a4a09a981f902c4d6aa5138c753d64fd' +md5sums=('f980a84719033e9efca01048da505dfb' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') diff --git a/community/marisa/ChangeLog b/community/marisa/ChangeLog new file mode 100644 index 000000000..b7f4b062d --- /dev/null +++ b/community/marisa/ChangeLog @@ -0,0 +1,10 @@ +2013-05-28 ponsfoot + + * marisa 0.2.4-2 + - Separate bindings to another packages + +2013-05-27 ponsfoot + + * marisa 0.2.4-1 + - Initial release on AUR + diff --git a/community/marisa/PKGBUILD b/community/marisa/PKGBUILD new file mode 100644 index 000000000..9d4effbc3 --- /dev/null +++ b/community/marisa/PKGBUILD @@ -0,0 +1,109 @@ +# Maintainer: Felix Yan +# Contributor: ponsfoot + +pkgbase=marisa +pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa') +pkgver=0.2.4 +pkgrel=2 +arch=('i686' 'x86_64') +url="https://code.google.com/p/marisa-trie/" +license=('BSD' 'LGPL') +options=(!libtool) +makedepends=('python2' 'ruby' 'perl') +changelog=ChangeLog +source=(https://marisa-trie.googlecode.com/files/$pkgbase-$pkgver.tar.gz) +sha1sums=('fb0ed7d993e84dff32ec456a79bd36a00022629d') + +build() { + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static \ + # --enable-popcnt + # --enable-sse2 + # --enable-sse3 + # --enable-ssse3 + # --enable-sse4.1 + # --enable-sse4.2 + # --enable-sse4 + # --enable-sse4a + + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make + + # Perl bindings + cd "${srcdir}/${pkgbase}-${pkgver}/bindings/perl" + perl Makefile.PL \ + INC="-I${srcdir}/${pkgbase}-${pkgver}/lib" \ + LIBS="-L${srcdir}/${pkgbase}-${pkgver}/lib/.libs" + make + + # Python bindings + cd "${srcdir}/${pkgbase}-${pkgver}/bindings/python" + python2 setup.py build_ext \ + --include-dirs="${srcdir}/${pkgbase}-${pkgver}/lib" \ + --library-dirs="${srcdir}/${pkgbase}-${pkgver}/lib/.libs" + python2 setup.py build + + # Ruby bindings + cd "${srcdir}/${pkgbase}-${pkgver}/bindings/ruby" + ruby extconf.rb \ + --with-opt-include="${srcdir}/${pkgbase}-${pkgver}/lib" \ + --with-opt-lib="${srcdir}/${pkgbase}-${pkgver}/lib/.libs" \ + --vendor + make +} + +package_marisa() { + pkgdesc="Static and space-efficient trie data structure library" + depends=('gcc-libs') + + cd "${pkgbase}-${pkgver}" + make DESTDIR="$pkgdir" install + + install -d "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}" + install -m 644 docs/* README "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/" + + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} + +package_perl-marisa() { + pkgdesc="Perl language binding for marisa" + depends=('perl' 'marisa') + + cd "${pkgbase}-${pkgver}/bindings/perl" + make DESTDIR="$pkgdir" install + + cd ../.. + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} + +package_python2-marisa() { + pkgdesc="Python 2.x language binding for marisa" + depends=('python2' 'marisa') + + cd "${pkgbase}-${pkgver}/bindings/python" + python2 setup.py install --root="$pkgdir" + + cd ../.. + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} + +package_ruby-marisa() { + pkgdesc="Ruby language binding for marisa" + depends=('ruby' 'marisa') + + cd "${pkgbase}-${pkgver}/bindings/ruby" + _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.0` + _arch=`pkg-config --variable=arch ruby-2.0` + make DESTDIR="$pkgdir" install \ + hdrdir="$_hdrdir" \ + arch_hdrdir="${_hdrdir}/${_arch}" \ + rubyhdrdir="$_hdrdir" + + cd ../.. + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD index c50ff5d41..f3c003518 100644 --- a/community/recorditnow/PKGBUILD +++ b/community/recorditnow/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81949 2013-01-04 08:45:38Z fyan $ +# $Id: PKGBUILD 93279 2013-07-01 05:44:50Z fyan $ # Maintainer: Felix Yan # Contributor: Yichao Yu # Contributor: Weng Xuetian @@ -7,15 +7,16 @@ pkgname=recorditnow pkgver=0.8.1 -pkgrel=4 +pkgrel=5 pkgdesc="A plugin based desktop recorder for KDE SC 4" arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php/RecordItNow?content=114610" license=('GPL') -depends=('kdebase-runtime' 'recordmydesktop' 'ffmpeg' 'xdg-utils') -makedepends=('cmake' 'automoc4') -optdepends=('mencoder: for mencoder encoder plugin') -provides=('recorditnow' 'joschy') +depends=('kdebase-runtime' 'ffmpeg' 'xdg-utils') +makedepends=('cmake' 'automoc4' 'recordmydesktop') +optdepends=('mencoder: for mencoder encoder plugin' + 'recordmydesktop') +provides=('joschy') conflicts=('joschy-git') install=recorditnow.install source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2" diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 884a97be5..114d1669d 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93061 2013-06-23 17:21:00Z andrea $ +# $Id: PKGBUILD 93287 2013-07-01 06:22:40Z andrea $ # Maintainer: Peter Lewis # Maintainer: Andrea Scarpino # Contributor: Panagiotis Papadopoulos pkgname=rekonq -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('kdebase-konqueror: search engines support' 'qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('1c552bad65c640bcd1a7550d45ad37ad93e16e75f14cf71685363e04f4c2a658') +sha256sums=('9cfdb7e02a08ad4d2b5dd6e8bd1c85c11013f41a3186c8c5c22454093722bc74') build(){ mkdir build diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD index f1981a49c..4aff8641e 100644 --- a/community/sakura/PKGBUILD +++ b/community/sakura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71005 2012-05-21 18:31:37Z rvanharen $ +# $Id: PKGBUILD 93276 2013-07-01 04:10:57Z angvp $ # Maintainer: Ronald van Haren # Contributor: Dmitry N. Shilov pkgname=sakura -pkgver=3.0.4 +pkgver=3.1.0 pkgrel=1 pkgdesc="A terminal emulator based on GTK and VTE" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('vte3' 'libxft' 'desktop-file-utils') makedepends=('cmake') source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") install=sakura.install -sha1sums=('e4d3a7fce9600cbdec9fda1e6fd20f38ebb4655e') +sha1sums=('159abc2f83e912da1bfb35c9b239b092e78a044f') build() { cd $srcdir/${pkgname}-${pkgver} diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD new file mode 100644 index 000000000..f90e2f9b7 --- /dev/null +++ b/community/xjadeo/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 93274 2013-07-01 02:54:17Z speps $ +# Maintainer : speps + +pkgname=xjadeo +pkgver=0.7.3 +pkgrel=1 +pkgdesc="A simple video player that is synchronized to jack transport." +arch=('i686' 'x86_64') +url="http://xjadeo.sourceforge.net" +license=('GPL') +depends=('ffmpeg' 'imlib2' 'jack' 'liblo' 'libxpm' 'libxv' 'portmidi') +makedepends=('qt4') +optdepends=('qt4: for the GUI (qjadeo)') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + "qjadeo.desktop") +install="$pkgname.install" +md5sums=('b5a67f7a8a8279f37ac681f40d6cbc10' + '315e2ab44ce3edf4068ff6db48942908') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-qtgui \ + --with-qt4prefix=/usr/lib/qt4 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # rc file + install -Dm644 doc/xjadeorc "$pkgdir/etc/xjadeorc" + + # desktop file + install -Dm644 ../qjadeo.desktop \ + "$pkgdir/usr/share/applications/qjadeo.desktop" + + # icon + install -Dm644 doc/xjadeo.png \ + "$pkgdir/usr/share/pixmaps/qjadeo.png" +} diff --git a/community/xjadeo/qjadeo.desktop b/community/xjadeo/qjadeo.desktop new file mode 100644 index 000000000..4d68949f6 --- /dev/null +++ b/community/xjadeo/qjadeo.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=qjadeo +Type=Application +Terminal=false +Name=QJadeo +Comment=QJadeo Jack Video Player +Categories=AudioVideo; +Icon=qjadeo \ No newline at end of file diff --git a/community/xjadeo/xjadeo.install b/community/xjadeo/xjadeo.install new file mode 100644 index 000000000..29a708b66 --- /dev/null +++ b/community/xjadeo/xjadeo.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_install() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index af14bbaa8..bddf6ee59 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180514 2013-03-22 13:00:52Z andrea $ +# $Id: PKGBUILD 189244 2013-07-01 10:04:11Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=cfitsio -pkgver=3.340 +pkgver=3.350 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('99210838af46b7bf2d945ccbb05e3ad3') +md5sums=('3e61f17731fe8db503b1b39873e4a8c4') build() { cd ${pkgname} diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD index d09988c74..6c4d74824 100644 --- a/extra/clutter-gtk/PKGBUILD +++ b/extra/clutter-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $ +# $Id: PKGBUILD 189249 2013-07-01 11:24:00Z jgc $ # Maintainer: Jan de Groot pkgname=clutter-gtk pkgver=1.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -11,8 +11,15 @@ options=('!libtool') license=('LGPL') depends=('clutter' 'gtk3') makedepends=('gobject-introspection') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch) +sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e' + '45e86e364756d6ac86c646ee1bcab6c9b94316673963e0b83b1140d9c4978bef') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch new file mode 100644 index 000000000..e3eb8ce13 --- /dev/null +++ b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch @@ -0,0 +1,29 @@ +From 6b1093d903f4605dcb974a3b299ed47f3e15edc1 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 27 Mar 2013 11:08:46 +0000 +Subject: util: Don't use clutter_x11_set_use_argb_visual() on non-X11 + +We shouldn't be running this on non-X11 windowing systems. + +https://bugzilla.gnome.org/show_bug.cgi?id=696687 +--- +diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c +index 38e3ced..d4a9fa5 100644 +--- a/clutter-gtk/gtk-clutter-util.c ++++ b/clutter-gtk/gtk-clutter-util.c +@@ -249,8 +249,11 @@ gtk_clutter_init_with_args (int *argc, + return CLUTTER_INIT_SUCCESS; + + #if defined(CLUTTER_WINDOWING_X11) +- /* enable ARGB visuals by default for Clutter */ +- clutter_x11_set_use_argb_visual (TRUE); ++ if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) ++ { ++ /* enable ARGB visuals by default for Clutter */ ++ clutter_x11_set_use_argb_visual (TRUE); ++ } + #endif + + /* we let gtk+ open the display */ +-- +cgit v0.9.2 diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index a183c7805..bcb81a0d9 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $ +# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z bpiotrowski $ # Maintainer: Jan de Groot # Contributor: Baptiste Daroussin # Contributor: Grigorios Bouzakis @@ -6,7 +6,7 @@ pkgname=giflib pkgver=4.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 giflib-4.2.1-quantize.patch) md5sums=('bbd3324af24156d5d7e66ab1cee8508d' - '67e46b344340ac10f4f597d772679f23') + '26174405ba886a89b8a4db18fe653a99') prepare() { cd ${pkgname}-${pkgver} diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch index 197f88b77..f6745d2c0 100644 --- a/extra/giflib/giflib-4.2.1-quantize.patch +++ b/extra/giflib/giflib-4.2.1-quantize.patch @@ -1,39 +1,39 @@ -diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in ---- giflib-4.2.1/lib/Makefile.in.quantize 2012-10-09 00:37:59.000000000 -0300 -+++ giflib-4.2.1/lib/Makefile.in 2012-11-17 12:16:04.485736553 -0200 -@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - libgif_la_DEPENDENCIES = - am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \ -- gifalloc.lo gif_err.lo -+ gifalloc.lo gif_err.lo quantize.lo - libgif_la_OBJECTS = $(am_libgif_la_OBJECTS) - libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c \ +From 7b01ed05d6c16172bd11a62d9b334f0eb7c5fc1e Mon Sep 17 00:00:00 2001 +From: "Eric S. Raymond" +Date: Sun, 3 Jun 2012 07:59:30 -0400 +Subject: [PATCH] Return QuantizeBuffer() to the core library. + +Fulfils SourceForge FR 3531618. +--- + NEWS | 2 + + lib/Makefile.am | 3 +- + lib/gif_lib.h | 9 ++ + lib/quantize.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + util/rgb2gif.c | 302 ------------------------------------------------------ + 5 files changed, 322 insertions(+), 303 deletions(-) + create mode 100644 lib/quantize.c + +index 813a2f8..ae6d5fa 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -13,7 +13,8 @@ libgif_la_SOURCES = dgif_lib.c \ gif_hash.h \ gifalloc.c \ gif_err.c \ -+ quantize.c \ - gif_lib_private.h +- gif_lib_private.h ++ gif_lib_private.h \ ++ quantize.c - libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ -@@ -319,6 +320,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@ + libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ $(LT_LDFLAGS) + libgif_la_LIBADD = @DEVS@ +diff --git a/lib/gif_lib.h b/lib/gif_lib.h +index e942089..73bc437 100644 +--- a/lib/gif_lib.h ++++ b/lib/gif_lib.h +@@ -207,6 +207,15 @@ int DGifGetLZCodes(GifFileType *GifFile, int *GifCode); - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h ---- giflib-4.2.1/lib/gif_lib.h.quantize 2012-10-09 00:36:32.000000000 -0300 -+++ giflib-4.2.1/lib/gif_lib.h 2012-11-17 12:16:04.488735917 -0200 -@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile) - #define D_GIF_ERR_IMAGE_DEFECT 112 - #define D_GIF_ERR_EOF_TOO_SOON 113 -+/****************************************************************************** + /****************************************************************************** + * O.K., here are the routines from GIF_LIB file QUANTIZE.C. +******************************************************************************/ +int QuantizeBuffer(unsigned int Width, unsigned int Height, @@ -42,37 +42,29 @@ diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h + GifByteType * OutputBuffer, + GifColorType * OutputColorMap); + - /* These are legacy. You probably do not want to call them directly */ - int DGifGetScreenDesc(GifFileType * GifFile); - int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType); -diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c ---- giflib-4.2.1/lib/quantize.c.quantize 2012-11-17 12:17:44.741435334 -0200 -+++ giflib-4.2.1/lib/quantize.c 2012-11-17 12:16:04.491735283 -0200 -@@ -0,0 +1,332 @@ ++/****************************************************************************** + * O.K., here are the routines from GIF_LIB file GIF_ERR.C. + ******************************************************************************/ + extern int GifError(void); /* new in 2012 - ESR */ +diff --git a/lib/quantize.c b/lib/quantize.c +new file mode 100644 +index 0000000..feb1dc7 +--- /dev/null ++++ b/lib/quantize.c +@@ -0,0 +1,309 @@ +/***************************************************************************** -+ * "Gif-Lib" - Yet another gif library. + * -+ * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989 -+ ****************************************************************************** -+ * Module to quatize high resolution image into lower one. You may want to -+ * peek into the following article this code is based on: -+ * "Color Image Quantization for frame buffer Display", by Paul Heckbert -+ * SIGGRAPH 1982 page 297-307. -+ ****************************************************************************** -+ * History: -+ * 5 Jan 90 - Version 1.0 by Gershon Elber. ++ * quantize.c - quantize a high resolution image into lower one ++ * ++ * Based on: "Color Image Quantization for frame buffer Display", by ++ * Paul Heckbert SIGGRAPH 1982 page 297-307. ++ * ++ * This doesn't really belong in the core library, was undocumented, ++ * and was removed in 4.2. Then it turned out some client apps were ++ * actually using it, so it was restored in 5.0. ++ * + *****************************************************************************/ + -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#ifdef __MSDOS__ -+#include -+#include -+#include -+#endif /* __MSDOS__ */ -+ +#include +#include +#include "gif_lib.h" @@ -80,20 +72,9 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + +#define ABS(x) ((x) > 0 ? (x) : (-(x))) + -+#define PROGRAM_NAME "giflib" -+ -+/* The colors are stripped to 5 bits per primary color if non MSDOS system -+ * or to 4 (not enough memory...) if MSDOS as first step. -+ */ -+#ifdef __MSDOS__ -+#define COLOR_ARRAY_SIZE 4096 -+#define BITS_PER_PRIM_COLOR 4 -+#define MAX_PRIM_COLOR 0x0f -+#else +#define COLOR_ARRAY_SIZE 32768 +#define BITS_PER_PRIM_COLOR 5 +#define MAX_PRIM_COLOR 0x1f -+#endif /* __MSDOS__ */ + +static int SortRGBAxis; + @@ -114,7 +95,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c +static int SubdivColorMap(NewColorMapType * NewColorSubdiv, + unsigned int ColorMapSize, + unsigned int *NewColorMapSize); -+static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2); ++static int SortCmpRtn(const void *Entry1, const void *Entry2); + +/****************************************************************************** + * Quantize high resolution image into lower one. Input image consists of a @@ -226,10 +207,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; + OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; + OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; -+ } else -+ fprintf(stderr, -+ "\n%s: Null entry in quantized color map - that's weird.\n", -+ PROGRAM_NAME); ++ } + } + + /* Finally scan the input buffer again and put the mapped index in the @@ -375,30 +353,327 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + * Routine called by qsort to compare to entries. + ****************************************************************************/ +static int -+SortCmpRtn(const VoidPtr Entry1, -+ const VoidPtr Entry2) { ++SortCmpRtn(const void *Entry1, ++ const void *Entry2) { + + return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - + (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; +} -diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c ---- giflib-4.2.1/util/rgb2gif.c.quantize 2012-10-09 00:28:12.000000000 -0300 -+++ giflib-4.2.1/util/rgb2gif.c 2012-11-17 12:16:04.490735495 -0200 -@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1 - * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. - ******************************************************************************/ - static int --QuantizeBuffer(unsigned int Width, -+GifQuantizeBuffer(unsigned int Width, - unsigned int Height, - int *ColorMapSize, - GifByteType * RedInput, -@@ -428,7 +428,7 @@ int main(int argc, char **argv) - sizeof(GifByteType))) == NULL) - GIF_EXIT("Failed to allocate memory required, aborted."); ++ ++/* end */ +diff --git a/util/rgb2gif.c b/util/rgb2gif.c +index 56386c7..46d9654 100644 +--- a/util/rgb2gif.c ++++ b/util/rgb2gif.c +@@ -69,308 +69,6 @@ static void SaveGif(GifByteType *OutputBuffer, + static void QuitGifError(GifFileType *GifFile); -- if (QuantizeBuffer(Width, Height, &ColorMapSize, -+ if (GifQuantizeBuffer(Width, Height, &ColorMapSize, - RedBuffer, GreenBuffer, BlueBuffer, - OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) - QuitGifError(NULL); + /****************************************************************************** +- * Code to quantize high resolution image into lower one. You may want to +- * peek into the following article this code is based on: +- * "Color Image Quantization for frame buffer Display", by Paul Heckbert +- * SIGGRAPH 1982 page 297-307. +- ****************************************************************************** +- * History: +- * 5 Jan 90 - Version 1.0 by Gershon Elber. +- *****************************************************************************/ +- +-#define ABS(x) ((x) > 0 ? (x) : (-(x))) +- +-#define COLOR_ARRAY_SIZE 32768 +-#define BITS_PER_PRIM_COLOR 5 +-#define MAX_PRIM_COLOR 0x1f +- +-static int SortRGBAxis; +- +-typedef struct QuantizedColorType { +- GifByteType RGB[3]; +- GifByteType NewColorIndex; +- long Count; +- struct QuantizedColorType *Pnext; +-} QuantizedColorType; +- +-typedef struct NewColorMapType { +- GifByteType RGBMin[3], RGBWidth[3]; +- unsigned int NumEntries; /* # of QuantizedColorType in linked list below */ +- unsigned long Count; /* Total number of pixels in all the entries */ +- QuantizedColorType *QuantizedColors; +-} NewColorMapType; +- +-static int SubdivColorMap(NewColorMapType * NewColorSubdiv, +- unsigned int ColorMapSize, +- unsigned int *NewColorMapSize); +-static int SortCmpRtn(const void *Entry1, const void *Entry2); +- +-/****************************************************************************** +- * Quantize high resolution image into lower one. Input image consists of a +- * 2D array for each of the RGB colors with size Width by Height. There is no +- * Color map for the input. Output is a quantized image with 2D array of +- * indexes into the output color map. +- * Note input image can be 24 bits at the most (8 for red/green/blue) and +- * the output has 256 colors at the most (256 entries in the color map.). +- * ColorMapSize specifies size of color map up to 256 and will be updated to +- * real size before returning. +- * Also non of the parameter are allocated by this routine. +- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. +- ******************************************************************************/ +-static int +-QuantizeBuffer(unsigned int Width, +- unsigned int Height, +- int *ColorMapSize, +- GifByteType * RedInput, +- GifByteType * GreenInput, +- GifByteType * BlueInput, +- GifByteType * OutputBuffer, +- GifColorType * OutputColorMap) { +- +- unsigned int Index, NumOfEntries; +- int i, j, MaxRGBError[3]; +- unsigned int NewColorMapSize; +- long Red, Green, Blue; +- NewColorMapType NewColorSubdiv[256]; +- QuantizedColorType *ColorArrayEntries, *QuantizedColor; +- +- ColorArrayEntries = (QuantizedColorType *)malloc( +- sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE); +- if (ColorArrayEntries == NULL) { +- return GIF_ERROR; +- } +- +- for (i = 0; i < COLOR_ARRAY_SIZE; i++) { +- ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR); +- ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) & +- MAX_PRIM_COLOR; +- ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR; +- ColorArrayEntries[i].Count = 0; +- } +- +- /* Sample the colors and their distribution: */ +- for (i = 0; i < (int)(Width * Height); i++) { +- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << +- (2 * BITS_PER_PRIM_COLOR)) + +- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << +- BITS_PER_PRIM_COLOR) + +- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); +- ColorArrayEntries[Index].Count++; +- } +- +- /* Put all the colors in the first entry of the color map, and call the +- * recursive subdivision process. */ +- for (i = 0; i < 256; i++) { +- NewColorSubdiv[i].QuantizedColors = NULL; +- NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0; +- for (j = 0; j < 3; j++) { +- NewColorSubdiv[i].RGBMin[j] = 0; +- NewColorSubdiv[i].RGBWidth[j] = 255; +- } +- } +- +- /* Find the non empty entries in the color table and chain them: */ +- for (i = 0; i < COLOR_ARRAY_SIZE; i++) +- if (ColorArrayEntries[i].Count > 0) +- break; +- QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i]; +- NumOfEntries = 1; +- while (++i < COLOR_ARRAY_SIZE) +- if (ColorArrayEntries[i].Count > 0) { +- QuantizedColor->Pnext = &ColorArrayEntries[i]; +- QuantizedColor = &ColorArrayEntries[i]; +- NumOfEntries++; +- } +- QuantizedColor->Pnext = NULL; +- +- NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */ +- NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */ +- NewColorMapSize = 1; +- if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) != +- GIF_OK) { +- free((char *)ColorArrayEntries); +- return GIF_ERROR; +- } +- if (NewColorMapSize < *ColorMapSize) { +- /* And clear rest of color map: */ +- for (i = NewColorMapSize; i < *ColorMapSize; i++) +- OutputColorMap[i].Red = OutputColorMap[i].Green = +- OutputColorMap[i].Blue = 0; +- } +- +- /* Average the colors in each entry to be the color to be used in the +- * output color map, and plug it into the output color map itself. */ +- for (i = 0; i < NewColorMapSize; i++) { +- if ((j = NewColorSubdiv[i].NumEntries) > 0) { +- QuantizedColor = NewColorSubdiv[i].QuantizedColors; +- Red = Green = Blue = 0; +- while (QuantizedColor) { +- QuantizedColor->NewColorIndex = i; +- Red += QuantizedColor->RGB[0]; +- Green += QuantizedColor->RGB[1]; +- Blue += QuantizedColor->RGB[2]; +- QuantizedColor = QuantizedColor->Pnext; +- } +- OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j; +- OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j; +- OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j; +- } else +- fprintf(stderr, +- "\n%s: Null entry in quantized color map - that's weird.\n", +- PROGRAM_NAME); +- } +- +- /* Finally scan the input buffer again and put the mapped index in the +- * output buffer. */ +- MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0; +- for (i = 0; i < (int)(Width * Height); i++) { +- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << +- (2 * BITS_PER_PRIM_COLOR)) + +- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) << +- BITS_PER_PRIM_COLOR) + +- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR)); +- Index = ColorArrayEntries[Index].NewColorIndex; +- OutputBuffer[i] = Index; +- if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i])) +- MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]); +- if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i])) +- MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]); +- if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i])) +- MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]); +- } +- +-#ifdef DEBUG +- fprintf(stderr, +- "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n", +- MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]); +-#endif /* DEBUG */ +- +- free((char *)ColorArrayEntries); +- +- *ColorMapSize = NewColorMapSize; +- +- return GIF_OK; +-} +- +-/****************************************************************************** +- * Routine to subdivide the RGB space recursively using median cut in each +- * axes alternatingly until ColorMapSize different cubes exists. +- * The biggest cube in one dimension is subdivide unless it has only one entry. +- * Returns GIF_ERROR if failed, otherwise GIF_OK. +- ******************************************************************************/ +-static int +-SubdivColorMap(NewColorMapType * NewColorSubdiv, +- unsigned int ColorMapSize, +- unsigned int *NewColorMapSize) { +- +- int MaxSize; +- unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor; +- long Sum, Count; +- QuantizedColorType *QuantizedColor, **SortArray; +- +- while (ColorMapSize > *NewColorMapSize) { +- /* Find candidate for subdivision: */ +- MaxSize = -1; +- for (i = 0; i < *NewColorMapSize; i++) { +- for (j = 0; j < 3; j++) { +- if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) && +- (NewColorSubdiv[i].NumEntries > 1)) { +- MaxSize = NewColorSubdiv[i].RGBWidth[j]; +- Index = i; +- SortRGBAxis = j; +- } +- } +- } +- +- if (MaxSize == -1) +- return GIF_OK; +- +- /* Split the entry Index into two along the axis SortRGBAxis: */ +- +- /* Sort all elements in that entry along the given axis and split at +- * the median. */ +- SortArray = (QuantizedColorType **)malloc( +- sizeof(QuantizedColorType *) * +- NewColorSubdiv[Index].NumEntries); +- if (SortArray == NULL) +- return GIF_ERROR; +- for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors; +- j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL; +- j++, QuantizedColor = QuantizedColor->Pnext) +- SortArray[j] = QuantizedColor; +- +- qsort(SortArray, NewColorSubdiv[Index].NumEntries, +- sizeof(QuantizedColorType *), SortCmpRtn); +- +- /* Relink the sorted list into one: */ +- for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++) +- SortArray[j]->Pnext = SortArray[j + 1]; +- SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL; +- NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0]; +- free((char *)SortArray); +- +- /* Now simply add the Counts until we have half of the Count: */ +- Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count; +- NumEntries = 1; +- Count = QuantizedColor->Count; +- while (QuantizedColor->Pnext != NULL && +- (Sum -= QuantizedColor->Pnext->Count) >= 0 && +- QuantizedColor->Pnext->Pnext != NULL) { +- QuantizedColor = QuantizedColor->Pnext; +- NumEntries++; +- Count += QuantizedColor->Count; +- } +- /* Save the values of the last color of the first half, and first +- * of the second half so we can update the Bounding Boxes later. +- * Also as the colors are quantized and the BBoxes are full 0..255, +- * they need to be rescaled. +- */ +- MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */ +- /* coverity[var_deref_op] */ +- MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */ +- MaxColor <<= (8 - BITS_PER_PRIM_COLOR); +- MinColor <<= (8 - BITS_PER_PRIM_COLOR); +- +- /* Partition right here: */ +- NewColorSubdiv[*NewColorMapSize].QuantizedColors = +- QuantizedColor->Pnext; +- QuantizedColor->Pnext = NULL; +- NewColorSubdiv[*NewColorMapSize].Count = Count; +- NewColorSubdiv[Index].Count -= Count; +- NewColorSubdiv[*NewColorMapSize].NumEntries = +- NewColorSubdiv[Index].NumEntries - NumEntries; +- NewColorSubdiv[Index].NumEntries = NumEntries; +- for (j = 0; j < 3; j++) { +- NewColorSubdiv[*NewColorMapSize].RGBMin[j] = +- NewColorSubdiv[Index].RGBMin[j]; +- NewColorSubdiv[*NewColorMapSize].RGBWidth[j] = +- NewColorSubdiv[Index].RGBWidth[j]; +- } +- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] = +- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] + +- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor; +- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor; +- +- NewColorSubdiv[Index].RGBWidth[SortRGBAxis] = +- MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis]; +- +- (*NewColorMapSize)++; +- } +- +- return GIF_OK; +-} +- +-/**************************************************************************** +- * Routine called by qsort to compare two entries. +- ****************************************************************************/ +-static int +-SortCmpRtn(const void *Entry1, +- const void *Entry2) { +- +- return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - +- (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; +-} +-/****************************************************************************** + * Interpret the command line and scan the given GIF file. + ******************************************************************************/ + int main(int argc, char **argv) +-- +1.8.3.2 + diff --git a/extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch b/extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch deleted file mode 100644 index 8a3f69bdb..000000000 --- a/extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ace549c1bf1861b4cbaec6f2451a6341aa738bae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Mon, 24 Jun 2013 18:09:04 +0200 -Subject: [PATCH] st: Be more forgiving when calling get_theme_node() on - unstaged widgets - -While it is obviously still an error to call get_theme_node() on a -widget that hasn't been added to the stage hierarchy yet, asserting -on it hasn't proven too successful in avoiding those errors - it's -likely the most frequent reason for crash reports. Just accept that -there'll always be code paths where we can hit this case and make -it non-fatal. - -https://bugzilla.gnome.org/show_bug.cgi?id=610279 ---- - src/st/st-widget.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/st/st-widget.c b/src/st/st-widget.c -index 42992ec..4875acc 100644 ---- a/src/st/st-widget.c -+++ b/src/st/st-widget.c -@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget) - - if (stage == NULL) - { -- g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -- st_describe_actor (CLUTTER_ACTOR (widget))); -+ g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -+ st_describe_actor (CLUTTER_ACTOR (widget))); -+ return g_object_new (ST_TYPE_THEME_NODE, NULL); - } - - if (parent_node == NULL) --- -1.8.3.1 - diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 930763625..128c3facb 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188954 2013-06-27 04:03:27Z heftig $ +# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $ # Maintainer: Ionut Biru # Contributor: Flamelab # Contributor: Lukas Jirkovsky pkgname=lcms2 -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc="Small-footprint color management engine, version 2" arch=('i686' 'x86_64') @@ -12,21 +12,21 @@ depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) -sha1sums=('9944902864283af49e4e21a1ca456db4e04ea7c2') +sha1sums=('bab3470471fc7756c5fbe71be9a3c7d677d2ee7b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD index c32bc93e5..1e1a449e0 100644 --- a/extra/libsecret/PKGBUILD +++ b/extra/libsecret/PKGBUILD @@ -3,13 +3,14 @@ pkgname=libsecret pkgver=0.15 -pkgrel=1 +pkgrel=2 pkgdesc='library for storing and retrieving passwords and other secrets.' arch=('i686' 'x86_64') license=('LGPL') url="https://live.gnome.org/Libsecret" depends=('glib2' 'libgcrypt') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala') +optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8') diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 34acb3e07..2c6bb39c0 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 181255 2013-04-02 18:31:27Z stephane $ +# $Id: PKGBUILD 189231 2013-06-30 23:32:16Z eric $ # Maintainer: Stéphane Gaudreault pkgname=openmpi -pkgver=1.6.4 -pkgrel=2 +pkgver=1.6.5 +pkgrel=1 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" license=('custom') depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc') makedepends=('inetutils') -options=(!libtool) +options=('!libtool') source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('38095d3453519177272f488d5058a98f7ebdbf10') +sha1sums=('93859d515b33dd9a0ee6081db285a2d1dffe21ce') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} # Make sure we use the system ltdl librariry rather than the ones in the tarball rm -r opal/libltdl @@ -40,7 +40,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # FS#28583 @@ -52,8 +52,9 @@ package() { # Openmpi's otfinfo conflicts with the one from texlive mv "${pkgdir}"/usr/bin/otfinfo{,mpi} - # Remove dangling symlink + # Remove dangling symlink and useless file rm "${pkgdir}"/usr/share/man/man1/orteCC.1 + rm "${pkgdir}"/usr/share/vampirtrace/config.log install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch deleted file mode 100644 index 5b65557c1..000000000 --- a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001 -From: Father Chrysostomos via RT -Date: Mon, 6 Aug 2012 17:42:14 -0400 -Subject: [PATCH] Fix compilation under threaded bleadperl - - Ticket - -CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.) ---- - tkGlue.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/tkGlue.c b/tkGlue.c -index 1b7c025..9079302 100644 ---- a/tkGlue.c -+++ b/tkGlue.c -@@ -4154,11 +4154,7 @@ int type; - SV *x = NULL; - int prefix = '?'; - name = SvPV(sv,na); --#ifdef USE_ITHREADS -- CopSTASHPV(PL_curcop) = NULL; --#else -- CopSTASH(PL_curcop) = NULL; --#endif -+ CopSTASH_set(PL_curcop, NULL); - switch (type) - { - case TK_CONFIG_SCALARVAR: --- -1.8.2.3 - diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch deleted file mode 100644 index 95067501f..000000000 --- a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001 -From: Slaven Rezic -Date: Sat, 23 Mar 2013 14:00:58 +0100 -Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an - expression - ---- - IO/IO.xs | 6 +----- - tkGlue.c | 5 +---- - 2 files changed, 2 insertions(+), 9 deletions(-) - -diff --git a/IO/IO.xs b/IO/IO.xs -index 8ae2a57..42f7515 100644 ---- a/IO/IO.xs -+++ b/IO/IO.xs -@@ -207,11 +207,7 @@ int offset - info.count = 0; - info.error = 0; - info.eof = 0; -- if (!SvUPGRADE(buf, SVt_PV)) -- { -- RETVAL = &PL_sv_undef; -- return; -- } -+ (void)SvUPGRADE(buf, SVt_PV); - SvPOK_only(buf); /* validate pointer */ - Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info); - do -diff --git a/tkGlue.c b/tkGlue.c -index dd3d283..cdc53ad 100644 ---- a/tkGlue.c -+++ b/tkGlue.c -@@ -3830,10 +3830,7 @@ ClientData clientData; - return EXPIRE((interp, "Cannot trace readonly variable")); - } - } -- if (!SvUPGRADE(sv, SVt_PVMG)) -- { -- return EXPIRE((interp, "Trace SvUPGRADE failed")); -- } -+ (void)SvUPGRADE(sv, SVt_PVMG); - - if (SvTYPE(sv) == SVt_PVAV) - { --- -1.8.2.3 - diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 0e04e7f76..f0c9f15a5 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,51 +1,36 @@ -# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $ +# $Id: PKGBUILD 189257 2013-07-01 18:23:51Z eric $ # Maintainer: # Contributor: François Charette # Contributor: Jason Chu # Contributor: Juergen Hoetzel pkgname=perl-tk -_cpanname=Tk -pkgver=804.030 -pkgrel=5 +pkgver=804.031 +pkgrel=1 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" +url="http://search.cpan.org/dist/Tk" license=('PerlArtistic' 'GPL' 'custom') depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz - 0001-Fix-compilation-under-threaded-bleadperl.patch - 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch) -md5sums=('13275e85f99ee467a86d9598a437abff' - '361c34978746310e5c31b7a47c016b22' - '46448cdac9d7159f15f2d4b2719d171b') - -prepare() { - cd "$srcdir/${_cpanname}-$pkgver" - - # https://rt.cpan.org/Public/Bug/Display.html?id=78824 - patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch" - - # https://rt.cpan.org/Public/Bug/Display.html?id=82677 - patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch" -} +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-${pkgver}.tar.gz) +md5sums=('57a8afd0563184c17a6470d1ee957f35') build() { - cd "$srcdir/${_cpanname}-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd Tk-$pkgver + perl Makefile.PL INSTALLDIRS=vendor make } #check() { -# cd "$srcdir/${_cpanname}-$pkgver" +# cd Tk-$pkgver # make test #} package() { - cd "$srcdir/${_cpanname}-$pkgver" + cd Tk-$pkgver make install DESTDIR="$pkgdir" # license diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index 6d869c448..dc774e99d 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 185050 2013-05-10 17:29:50Z andrea $ +# $Id: PKGBUILD 189254 2013-07-01 16:34:52Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=soprano pkgver=2.9.2 -pkgrel=1 +pkgrel=2 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') +depends=('qt4' 'libiodbc' 'virtuoso-base' 'redland') makedepends=('cmake' 'java-environment' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('60ce910cf3c8e4655c614b45d73f2b2a') -build() { +prepare() { mkdir build +} + +build() { cd build # we need the rpath cmake ../${pkgname}-${pkgver} \ diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index a4ec0be5e..1d51ed253 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181132 2013-03-31 23:20:08Z bisson $ +# $Id: PKGBUILD 189234 2013-07-01 01:03:08Z bisson $ # Maintainer: Gaetan Bisson # Contributor: damir pkgname=uim -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -16,8 +16,8 @@ optdepends=('qt4: immodule and helper applications' 'gtk3: immodules and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('13178e0ad9e9196e3fdb0bb9806e4add8fe3a8e5') +source=("https://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('409c30b31b9e58e3c18cb7862933487b0585cd1d') install=install diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index c864253f4..0bb678eb6 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 188929 2013-06-25 17:07:01Z andyrtr $ +# $Id: PKGBUILD 189247 2013-07-01 10:57:37Z jgc $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.14.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -19,38 +19,44 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-sis.patch xserver-1.6.0-less-acpi-brokenness.patch bug59825.patch + xephyr-glx.patch xvfb-run xvfb-run.1 10-quirks.conf - git-fixes.patch) + fb-rename-wfbDestroyGlyphCache.patch) sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' + 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1') -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - +prepare() { + cd "${pkgbase}-${pkgver}" # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + patch -Np1 -i ../autoconfig-nvidia.patch # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + patch -Np0 -i ../autoconfig-sis.patch # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo - patch -Np1 -i "${srcdir}/bug59825.patch" + patch -Np1 -i ../bug59825.patch # From Fedora. Do not build acpid code, it is buggy and we do not need it - patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch" + patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch - # post release git fixes - patch -Np1 -i "${srcdir}/git-fixes.patch" + # Add GLX support for Xephyr - https://bugs.freedesktop.org/show_bug.cgi?id=62346 + patch -Np0 -i ../xephyr-glx.patch + # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 + patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch +} +build() { + cd "${pkgbase}-${pkgver}" autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ @@ -93,7 +99,7 @@ package_xorg-server-common() { pkgdesc="Xorg server common files" depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" @@ -115,7 +121,7 @@ package_xorg-server() { groups=('xorg') conflicts=('nvidia-utils<=290.10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/X11" @@ -145,7 +151,7 @@ package_xorg-server-xephyr() { pkgdesc="A nested X server that runs as an X application" depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" + cd "${pkgbase}-${pkgver}/hw/kdrive" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" @@ -154,9 +160,9 @@ package_xorg-server-xephyr() { package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common) + depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common xorg-xauth) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" + cd "${pkgbase}-${pkgver}/hw/vfb" make DESTDIR="${pkgdir}" install install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" @@ -170,7 +176,7 @@ package_xorg-server-xnest() { pkgdesc="A nested X server that runs as an X application" depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" + cd "${pkgbase}-${pkgver}/hw/xnest" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" @@ -181,7 +187,7 @@ package_xorg-server-xdmx() { pkgdesc="Distributed Multihead X Server and utilities" depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" + cd "${pkgbase}-${pkgver}/hw/dmx" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" @@ -199,7 +205,7 @@ package_xorg-server-devel() { # not technically required but almost every Xorg pkg needs it to build xorg-util-macros) - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/bin" diff --git a/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch new file mode 100644 index 000000000..177f908ef --- /dev/null +++ b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch @@ -0,0 +1,27 @@ +From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001 +From: Aaron Plattner +Date: Wed, 06 Mar 2013 17:40:28 +0000 +Subject: fb: Rename wfbDestroyGlyphCache + +Renaming this function was missed in commit +9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define +functions named fbDestroyGlyphCache. + +Signed-off-by: Aaron Plattner +Reviewed-by: Søren Sandmann +Signed-off-by: Keith Packard +--- +diff --git a/fb/wfbrename.h b/fb/wfbrename.h +index 588440c..54d00d0 100644 +--- a/fb/wfbrename.h ++++ b/fb/wfbrename.h +@@ -52,6 +52,7 @@ + #define fbCreatePixmap wfbCreatePixmap + #define fbCreatePixmapBpp wfbCreatePixmapBpp + #define fbCreateWindow wfbCreateWindow ++#define fbDestroyGlyphCache wfbDestroyGlyphCache + #define fbDestroyPixmap wfbDestroyPixmap + #define fbDestroyWindow wfbDestroyWindow + #define fbDoCopy wfbDoCopy +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch deleted file mode 100644 index 177f908ef..000000000 --- a/extra/xorg-server/git-fixes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001 -From: Aaron Plattner -Date: Wed, 06 Mar 2013 17:40:28 +0000 -Subject: fb: Rename wfbDestroyGlyphCache - -Renaming this function was missed in commit -9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define -functions named fbDestroyGlyphCache. - -Signed-off-by: Aaron Plattner -Reviewed-by: Søren Sandmann -Signed-off-by: Keith Packard ---- -diff --git a/fb/wfbrename.h b/fb/wfbrename.h -index 588440c..54d00d0 100644 ---- a/fb/wfbrename.h -+++ b/fb/wfbrename.h -@@ -52,6 +52,7 @@ - #define fbCreatePixmap wfbCreatePixmap - #define fbCreatePixmapBpp wfbCreatePixmapBpp - #define fbCreateWindow wfbCreateWindow -+#define fbDestroyGlyphCache wfbDestroyGlyphCache - #define fbDestroyPixmap wfbDestroyPixmap - #define fbDestroyWindow wfbDestroyWindow - #define fbDoCopy wfbDoCopy --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/xephyr-glx.patch b/extra/xorg-server/xephyr-glx.patch new file mode 100644 index 000000000..3011e2497 --- /dev/null +++ b/extra/xorg-server/xephyr-glx.patch @@ -0,0 +1,39 @@ +--- hw/kdrive/ephyr/ephyrinit.c 2013-03-14 19:07:41.904335711 +0100 ++++ hw/kdrive/ephyr/ephyrinit.c.new 2013-03-14 19:07:33.024335444 +0100 +@@ -28,6 +28,7 @@ + #endif + #include "ephyr.h" + #include "ephyrlog.h" ++#include "glx_extinit.h" + + extern Window EphyrPreExistingHostWin; + extern Bool EphyrWantGrayScale; +@@ -53,9 +54,28 @@ + KdCardInfoAdd(&ephyrFuncs, 0); + } + ++static const ExtensionModule ephyrExtensions[] = { ++#ifdef GLXEXT ++ { GlxExtensionInit, "GLX", &noGlxExtension }, ++#endif ++}; ++ ++static ++void ephyrExtensionInit(void) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++) ++ LoadExtension(&ephyrExtensions[i], TRUE); ++} ++ ++ + void + InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) + { ++ if (serverGeneration == 1) ++ ephyrExtensionInit(); ++ + KdInitOutput(pScreenInfo, argc, argv); + } + diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index d9c2c7481..45294e48e 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: André Silva pkgbase=icedove-l10n -_pkgver=17.0.5 -pkgver=17.0.5.2 +_pkgver=17.0.7 +pkgver=17.0.7.1 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -64,58 +64,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - 'ef463b3772f804beb4108e15917485fd' - '6125a2e91119afe4cd4fb78909bc2168' - '990067ee981db3bf9873e4bd9b2b1eba' - 'e32d496230cba49a435775359d4485ce' - 'd212d8bc244184e816cf36a9b654e7e6' - '4a83b506d1b81dfffa0b33bc0f12b24f' - '6349985a77b2db81a43cb22291bfd972' - 'dd4a259bfa4ce6816c55e9d7ff7f1172' - 'dc3ec06ccb5e98cfa332fca40af77470' - 'e81e63d8fac6c61cbbe72b1c8b0ce05c' - 'f0850f83f396c33a4e69abd00bda0e55' - 'ffc5de6b5409cf7cdd411ae853e0ba05' - '169780df5d160a04221dd80c92dd131a' - '8d1eacb770748156dbe02e493c41a5a6' - 'a3a0d856da6af722a6444567b684eb14' - '798415f06ce916eb6c84ea4cf97e1253' - 'c8eefe6a65295d354beb59e8f1b3116e' - '3ec1490226e064bc1145072ecdf031b4' - 'a3ff2959c9375084683b0741797103f9' - '99ea64506470bf7938e169bfe5f569b3' - '8170d58dcbb1b84820ef0ace6dc23965' - '24ba56f81446d551101d1848ed660682' - '53b9b22f7ad5916c8dfccd8b758828dc' - '0bdcd2f628dff58a4544e93a88344b76' - '87d516fbb68ae06d5ee7439a8a4d3d96' - 'c3cfa07d55fec1eb558e11c63ebd2a97' - '9845802371f603cb70df77a63088c16d' - '552e297a315a1b6f308604da4b492c53' - 'dc6755c33351b95f9e883c8e64fab7b6' - 'f3a67c52f5c5ca8cd5484250617f1aff' - '48fc583c7e67e87113fb73243da46313' - '4450b7753336f279296260e444cb0ba2' - '3a639521e20e5fb936f6d1b7679becd9' - '241a29846743f4dbcd5704e470193f30' - '71d71192e076a889da26129efd5f2f3d' - 'efc91beb8c199d459e1f24164066d75e' - 'ed717c1b94618faa8304796f1ff0acd7' - '8fc0aea02c1373f0ac0b7fa7eac2fa0c' - '808c60d4af8ee7b6bbbd82a5079c293e' - '6f0e4c6fe66e6d0e98f2fc444b59d629' - 'bc5e9972f5a092f4f28f577f7ade7ad7' - '2f852610ddc1550200965d4be6320879' - '6ad80cd433ef69c3577bfea9fd26cedc' - '0dd02b5317c9656c64543067956940bf' - '9e0d2f288130f048358135a89732ca85' - '936dbda4758d9a65f8c27603a2dee3bd' - '820d70ce31ca9731c162ab942b0daea1' - 'd737350d9edb73c15096e867fbdd8f3c' - 'b1896502d411dd6037f141d3561461d4' - '491a3a386c4963f162e050c370ffa140' - 'aa9f4e83501e624e4054f3ff61b71db3' - '257ee623933cfda550a8643a1a0b1d1c' - 'c3a8fa4fc511d914892e08fa17fab8a9' - '44be6381519c6c5ea785a4f5a5122a64' - '6693c752bf6272caed2e204556fc69b8') + 'fb33f8da3bc9f0906baf5222098e9359' + '0ceada37eed6ea7986fdffd6b0ea5aac' + '612dcc6e280b547efe9d6cebf82a1eb5' + 'fcc841359ef595fb58e6ef2333453ca0' + '69c31584fd7b442b655e58e4556f5034' + '479b6a37772b6885c52f26187818c542' + 'b723a4ae893838f4d332c5118bacd2fb' + '8cae26bd3354071f96faaa58f633f7f3' + '99fcd0609b232ba167d22200df617ce4' + '14e0224981659188f41d15d8a2a116bf' + '1da89ba6776c5be68851ab6782809b25' + '4e5e74537f138c0a5cfef02931e57c6b' + '67bb0b85fd5fd3f7344982cb0f93cc60' + 'a7120022d3a957f152044f5d7ce155e2' + '44a35e42bc9682b42f7fad416f803b83' + '149da69e91a018b8c2d2341b62091b18' + 'e78c3749605674623a5ebd455d1da5e6' + '18d4429db86023c3cff4cdfdb3c7db61' + '327f085c787a61c95b7904f1d68ba8ba' + 'c7f83c1d5fac8bae0257f5269d6318a9' + '2d8f1bf1e814fc984d791a95c4ef8811' + '2513698f14cbc85651c5b752845a9d7f' + '5d727ff5a17e105abe44b1e970868ea2' + 'e233b53dce6072308c190cdb83cb3d08' + 'f8c1f680d62c76607c12cf517fb4d9b1' + '124a5110c4e807bae739fa5542b21e6f' + '8031d7162eeb68343d0879550653c13d' + 'af6f26ef85012c84fb28279230a6bf47' + '93a25ac664d66deb4e0e88a9dd0f601f' + 'f834580781619b97659dc95d8f203d2b' + 'd54e1e7ed5c5d88db1ef2445bc0c9948' + '7a899329dafb829075f735990171823f' + '46fb6882a4350a86616dd0859b230602' + '80492e996b180062f56f9005d4083608' + '9fab024f293084e98e00639bb156b7aa' + 'a24adcb523efdfb836d7aa8dcb192a8b' + '3742697f98cec4bb7c565cdede33263f' + 'd9362ae826eb8591db5d6cf3f56bba0f' + '5e05ee5c2ef8ee9e5869a1f26277df2c' + '6cd8b8a4f19df69408ed03e7d09032dd' + '5ff06adb7f42975034f29910f5c9698d' + '74b76de767b3d1fc5eae3b40f55bca20' + 'd387e154d9a6d322551a16ac9e9b38e3' + '03c41d2d47146ca18aab8dff9023d3aa' + '8fb9aa07d7c5244da75192ebaa254d3c' + '84377496e3bc15d46f85bef767ca13ba' + '07ac58fb12e6744279670c22bbe41d9b' + 'b12f1a56bc7ce08c2800955257db1799' + '36ffa376a0e38e5b7000c2725cca994d' + '1fb8619dff3c3ee7c07e659a88094b8f' + '158ca3414b6ac982fc0c97d8b4f28c98' + '1fdabfde405e2bf54a4c8ad25c04d98f' + 'ffce5a4d36bc8a42496fda405ac677f7' + 'e183f1b3c17813399a930cb7b66d545d' + '12a93560247c526b0d29cacfc9f4882d') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 8473cadd8..5fcf9f112 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=icedove -_debver=17.0.5 -_debrel=2 +_debver=17.0.7 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('0c68298c17757257da79b6bb39e3fd10' - '2086f544ef90570d7629374aeac22aa6' +md5sums=('d5c0351b374b6caf536c11522929d822' + '0c9fc53103e7168edd972466a29cc8cf' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' @@ -94,6 +94,8 @@ prepare() { } build() { + export DEBIAN_BUILD="comm-esr17" + cd "${srcdir}/${DEBIAN_BUILD}" export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" @@ -103,6 +105,8 @@ build() { } package() { + export DEBIAN_BUILD="comm-esr17" + cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="${pkgdir}" install -- cgit v1.2.3-54-g00ecf