From f8db5d1487e8e0ceeb97a396e357c1540a047ed8 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Sep 2011 23:14:32 +0000 Subject: Wed Sep 28 23:14:32 UTC 2011 --- extra/feh/PKGBUILD | 6 +++--- extra/ghex/PKGBUILD | 8 ++++---- extra/gtkpod/PKGBUILD | 12 ++++++------ extra/gtkpod/gtkpod.install | 1 + extra/libebml/PKGBUILD | 6 +++--- extra/libmatroska/PKGBUILD | 6 +++--- extra/live-media/PKGBUILD | 6 +++--- extra/mkvtoolnix/PKGBUILD | 8 ++++---- extra/nautilus-sendto/PKGBUILD | 8 ++++---- extra/pangomm/PKGBUILD | 8 ++++---- extra/tumbler/PKGBUILD | 11 +++++++---- extra/tumbler/fix-video-image.patch | 34 ++++++++++++++++++++++++++++++++++ extra/xfce-utils/PKGBUILD | 7 ++++--- extra/xfce4-panel/PKGBUILD | 7 ++++--- extra/xfce4-settings/PKGBUILD | 8 +++++--- extra/xfwm4/PKGBUILD | 7 ++++--- extra/xulrunner/PKGBUILD | 25 ++++++++----------------- extra/xulrunner/mozconfig | 1 - 18 files changed, 101 insertions(+), 68 deletions(-) create mode 100644 extra/tumbler/fix-video-image.patch (limited to 'extra') diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 9c1924ec3..510dc1146 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137830 2011-09-11 21:00:49Z bisson $ +# $Id: PKGBUILD 138608 2011-09-27 12:17:18Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andrea Scarpino # Contributor: dorphell # Contributor: Tom Newsom pkgname=feh -pkgver=1.16.1 +pkgver=1.16.2 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f016043826cf30d33675fceba24d9753206d947a') +sha1sums=('bbb530f1bca9140040052164c3f79289011c45f1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index 3791b0e5e..b4a6c226e 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135591 2011-08-16 08:47:35Z ibiru $ +# $Id: PKGBUILD 138657 2011-09-27 14:19:40Z ibiru $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=ghex -pkgver=2.90.1 +pkgver=3.0.0 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('gtk3' 'hicolor-icon-theme') makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=ghex.install -source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/2.90/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e736a322c3e25d0733bee72848f586c6477c11c0f0a63a77069be9048a66ec9a') +source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/3.0/${pkgname}-${pkgver}.tar.xz) +sha256sums=('c1b44a962ff1d6c7f1ad012ef1971a227e6d00a0de6f1275cbb714db1a96c674') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 5ffc377f3..2ce59e323 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 136044 2011-08-22 03:18:52Z eric $ +# $Id: PKGBUILD 138768 2011-09-28 01:47:51Z kevin $ # Maintainer: Kevin Piche # Contributor: Aaron Griffin pkgname=gtkpod -pkgver=1.0.0 -pkgrel=2 +pkgver=2.1.0 +pkgrel=1 pkgdesc="A platform independent GUI for Apple's iPod using GTK2" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" license=('GPL') -depends=('awk' 'libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 'hicolor-icon-theme') -makedepends=('intltool') +depends=('anjuta' 'curl' 'dconf' 'flac' 'libid3tag' 'libgpod>=0.8.0') +makedepends=('flex' 'intltool') optdepends=('libmp4v2: MP4/h264 support' 'vorbis-tools: OGG support' 'id3v2: mp3 conversion support') install=gtkpod.install source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz) -md5sums=('cadd402dcd1cfbedda0357bf24965a7c') +md5sums=('8e01f7cf2db1a421140eab561aee26d7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtkpod/gtkpod.install b/extra/gtkpod/gtkpod.install index 17ca8f78a..c5d357a38 100644 --- a/extra/gtkpod/gtkpod.install +++ b/extra/gtkpod/gtkpod.install @@ -1,5 +1,6 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD index 9b49bb4b4..275dbc9c9 100644 --- a/extra/libebml/PKGBUILD +++ b/extra/libebml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129933 2011-06-30 13:52:37Z giovanni $ +# $Id: PKGBUILD 138665 2011-09-27 14:36:55Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: 03/08/04 pkgname=libebml -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Extensible Binary Meta Language library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://dl.matroska.org/downloads/libebml/" license=('LGPL') depends=('gcc-libs') source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('13c5a10e260e703d3a7f003fdc995183') +md5sums=('726cc2bd1a525929ff35ff9854c0ebab') build() { cd "${srcdir}/${pkgname}-${pkgver}/make/linux" diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD index 656c4f3d5..1504138cc 100644 --- a/extra/libmatroska/PKGBUILD +++ b/extra/libmatroska/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129938 2011-06-30 14:07:10Z giovanni $ +# $Id: PKGBUILD 138677 2011-09-27 15:10:51Z giovanni $ # Maintainer: Giovanni Scafora # Contributor 03/08/04 pkgname=libmatroska -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 pkgdesc="Matroska library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://dl.matroska.org/downloads/libmatroska/" license=('LGPL') depends=('libebml') source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a4f967f9ade56d5181714f3199ffa241') +md5sums=('f4a8c411f09d39c754eb726efd616043') build() { cd "${srcdir}/${pkgname}-${pkgver}/make/linux" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 5afd55e19..68b959a6d 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136923 2011-09-02 23:55:49Z giovanni $ +# $Id: PKGBUILD 138700 2011-09-27 16:47:11Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2011.09.02 +pkgver=2011.09.19 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('e66901b4bc2b4e6fbd7821880d0373fd') +md5sums=('7834800179503377d7142b4bfbbf0dca') build() { cd ${srcdir}/live diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 217a30f3f..9388dc481 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 133025 2011-07-26 21:15:25Z eric $ +# $Id: PKGBUILD 138691 2011-09-27 16:36:38Z giovanni $ # Maintainer: Giovanni Scafora pkgname=mkvtoolnix -pkgver=4.9.1 -pkgrel=2 +pkgver=5.0.0 +pkgrel=1 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" arch=('i686' 'x86_64') license=('GPL') @@ -11,7 +11,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis') makedepends=('boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5981f266e6d25da4a49f7464e4a97cdf') +md5sums=('8a8d29c3b0eb202bb32ea44c54aeb83b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD index cc9b88efe..2802b3b53 100644 --- a/extra/nautilus-sendto/PKGBUILD +++ b/extra/nautilus-sendto/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117738 2011-04-04 17:38:24Z heftig $ +# $Id: PKGBUILD 138754 2011-09-27 19:55:58Z ibiru $ # Maintainer: Jan de Groot # Contributor: Eduardo Romero # Contributor: Tor Krill pkgname=nautilus-sendto -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Nautilus context menu for sending files." arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ depends=('evolution-data-server' 'nautilus' 'dconf') makedepends=('pidgin' 'gajim' 'gettext' 'intltool') options=('!libtool' '!emptydirs') install=nautilus-sendto.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8821c6aab186ff3aa852438b4f2b64dce9f68e264908ce009e331bac74969e21') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('34617084b731db8bf3ffb517497d5645283f4aa7a9ebfa2a05da8c12066a0f14') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD index 549ba7d87..c6d8b9095 100644 --- a/extra/pangomm/PKGBUILD +++ b/extra/pangomm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136693 2011-08-31 14:25:10Z ibiru $ +# $Id: PKGBUILD 138625 2011-09-27 13:05:44Z ibiru $ # Maintainer: Jan de Groot pkgbase=pangomm pkgname=('pangomm' 'pangomm-docs') -pkgver=2.28.2 +pkgver=2.28.3 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('ec1d97245eada5cf18d0e7af3f6e31498f25623b4a354589d631d2dff92fd88f') +sha256sums=('cf6eb58d58dc92df5c94012299e2c4f556ae55b4bafdf8f3768f74b7d60be0c3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index e51bf5bfd..ffefa7234 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138386 2011-09-21 13:11:57Z tpowa $ +# $Id: PKGBUILD 138679 2011-09-27 15:18:13Z tpowa $ # Maintainer: Andreas Radke # Contributor: Jan Jezek pkgname=tumbler pkgver=0.1.22 -pkgrel=1 +pkgrel=2 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') @@ -15,10 +15,12 @@ makedepends=('intltool' 'ffmpegthumbnailer') optdepends=('ffmpegthumbnailer: for video thumbnails' 'gstreamer0.10: for video thumbnails') options=('!libtool') -source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2) +source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2 + fix-video-image.patch) build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ../fix-video-image.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ @@ -31,4 +33,5 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=$pkgdir install } -md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9') +md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9' + 'be9b0f1c3a4b0be102774c84d5ac29e6') diff --git a/extra/tumbler/fix-video-image.patch b/extra/tumbler/fix-video-image.patch new file mode 100644 index 000000000..11c9d867b --- /dev/null +++ b/extra/tumbler/fix-video-image.patch @@ -0,0 +1,34 @@ +From aab140d868c1ebedbb04bbd65deddf94dc21787b Mon Sep 17 00:00:00 2001 +From: Jannis Pohlmann +Date: Mon, 26 Sep 2011 17:28:51 +0000 +Subject: Fix generation of video images by starting the pipeline (bug #7996). + +Patch provided by Sam Thursfield. +--- +diff --git a/NEWS b/NEWS +index 0ff1c1c..48e3896 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,7 @@ ++0.1.xx ++====== ++- Fix generation of video images by starting the pipeline (bug #7996). ++ + 0.1.22 + ====== + - Add coding style documentation. +diff --git a/plugins/gst-thumbnailer/gst-helper.c b/plugins/gst-thumbnailer/gst-helper.c +index b8a29ab..dead043 100644 +--- a/plugins/gst-thumbnailer/gst-helper.c ++++ b/plugins/gst-thumbnailer/gst-helper.c +@@ -154,6 +154,8 @@ gst_helper_convert_buffer_to_pixbuf (GstBuffer *buffer, + + bus = gst_element_get_bus (GST_ELEMENT (pipeline)); + ++ gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); ++ + i = 0; + msg = NULL; + while (msg == NULL && i < 5) +-- +cgit diff --git a/extra/xfce-utils/PKGBUILD b/extra/xfce-utils/PKGBUILD index abf733525..063795561 100644 --- a/extra/xfce-utils/PKGBUILD +++ b/extra/xfce-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127773 2011-06-18 10:07:36Z andyrtr $ +# $Id: PKGBUILD 138663 2011-09-27 14:33:37Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias pkgname=xfce-utils -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Utilities for Xfce" arch=(i686 x86_64) @@ -19,7 +19,8 @@ optdepends=('perl: for migration scripts' options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7f48198f4bee3edf7869064c2922c609') +md5sums=('03b5fba5f63f4f1a31cc7d3728f3c87e') +sha1sums=('159d445b689ebbf73462a4b4baf5cce4e04afaab') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD index f0096c1b1..041ebf6a5 100644 --- a/extra/xfce4-panel/PKGBUILD +++ b/extra/xfce4-panel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128301 2011-06-22 15:48:28Z andyrtr $ +# $Id: PKGBUILD 138667 2011-09-27 14:43:08Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias pkgname=xfce4-panel -pkgver=4.8.5 +pkgver=4.8.6 pkgrel=1 pkgdesc="Panel for the Xfce desktop environment" arch=('i686' 'x86_64') @@ -15,7 +15,8 @@ makedepends=('intltool' 'gtk-doc') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3c00e92821709baa2a71b166a32d46a2') +md5sums=('9d7bf0503d5867c4044cef04bb5845b1') +sha1sums=('332fc968332e6271e1bb65d6de8de2524b0440ec') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index ba264dd3d..ab5adf0c1 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124328 2011-05-19 16:30:23Z andyrtr $ +# $Id: PKGBUILD 138683 2011-09-27 15:54:14Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias # Contributor: Corrado Primier pkgname=xfce4-settings -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64') @@ -16,8 +16,10 @@ makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 xfce4-settings-4.6.0.patch) -md5sums=('a45420fea20f29265ab6785cb1d07377' +md5sums=('4669298cc8a4abf0e5a410016b575030' '3046732e5d73c9939e7674602eadb1e2') +sha1sums=('98431633ba3ec2a4a10182bc7266904d9256949b' + '18f5eaf1fd86b957bae2e41fbdd83edef5437b3c') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD index a7d92fb73..4aa86f2f2 100644 --- a/extra/xfwm4/PKGBUILD +++ b/extra/xfwm4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108288 2011-01-30 17:29:07Z andyrtr $ +# $Id: PKGBUILD 138685 2011-09-27 16:03:39Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias pkgname=xfwm4 -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Xfce window manager" arch=('i686' 'x86_64') @@ -15,7 +15,8 @@ makedepends=('pkgconfig' 'intltool') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('447433dca613180ebd6cfed4beb1c1c9') +md5sums=('41b730d5abf39a69fc3b221728ddaa75') +sha1sums=('7822408eaddd9fc4937d9e6825eda7d56dc46b06') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 8180b8fec..da74448ea 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 136643 2011-08-31 10:33:15Z ibiru $ +# $Id: PKGBUILD 138761 2011-09-27 20:42:01Z ibiru $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xulrunner -pkgver=6.0.1 -_ffoxver=6.0.1 +pkgver=7.0 +_ffoxver=7.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify') -makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'gconf') +makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2 mozconfig - mozilla-pkgconfig.patch - moz-639554.patch) + mozilla-pkgconfig.patch) options=('!emptydirs' '!buildflags') replaces=('xulrunner-oss') -md5sums=('43b71655e1307c7f62896339e70c9aed' - '2358a2ddd35bcdd62ff42442dfe548d9' - '639ea80e823543dd415b90c0ee804186' - '96d3c1790a56f8e6df88e327adccf3bf') +md5sums=('673a015a23e3fefa18d80db68c8b9fc1' + '108a53313284908cc3afe5e29a7557e9' + '639ea80e823543dd415b90c0ee804186') build() { cd "${srcdir}/mozilla-release" @@ -28,8 +26,6 @@ build() { #fix libdir/sdkdir - fedora patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch" - #upstream fixes - patch -Np1 -i "${srcdir}/moz-639554.patch" export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" @@ -40,11 +36,6 @@ package() { cd "${srcdir}/mozilla-release" make -j1 -f client.mk DESTDIR="${pkgdir}" install - #Remove included dictionaries, add symlink to system myspell path. - #Note: this will cause file conflicts when users have installed dictionaries in the old location - rm -rf "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries" - # add xulrunner library path to ld.so.conf install -d ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig index 03a352920..96e8a6bd9 100644 --- a/extra/xulrunner/mozconfig +++ b/extra/xulrunner/mozconfig @@ -47,7 +47,6 @@ ac_add_options --disable-pedantic ac_add_options --enable-gio ac_add_options --disable-gnomevfs -ac_add_options --enable-gconf ac_add_options --enable-libnotify export BUILD_OFFICIAL=1 -- cgit v1.2.3-54-g00ecf