From ec9bd2e246eb94181a9254dcb2de7ddc191bb8cc Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Jul 2011 14:14:44 +0000 Subject: Tue Jul 12 14:14:44 UTC 2011 --- extra/avahi/PKGBUILD | 16 +- extra/avahi/install | 21 ++ extra/avahi/rc.d.patch | 11 + extra/gimp-devel/PKGBUILD | 37 ++- extra/gimp-devel/uri-backend-libcurl.patch | 44 +++ extra/gimp/PKGBUILD | 34 +- extra/gimp/uri-backend-libcurl.patch | 77 +++++ extra/gjs/PKGBUILD | 14 +- extra/gjs/gjs-0.7.14-js185-backport.patch | 436 ++++++++++++++++++++++++++ extra/gnome-python-extras/PKGBUILD | 26 +- extra/gnome-shell/PKGBUILD | 4 +- extra/js/PKGBUILD | 37 +++ extra/js/js185-destdir.patch | 15 + extra/mercurial/PKGBUILD | 11 +- extra/mkvtoolnix/PKGBUILD | 10 +- extra/pixman/PKGBUILD | 16 +- extra/poppler/PKGBUILD | 6 +- extra/qtiplot/PKGBUILD | 47 ++- extra/qtiplot/build.conf.archlinux | 2 + extra/qtiplot/qtiplot-0.9.8.6-gold.patch | 15 + extra/qtiplot/qtiplot-0.9.8.6-kde.patch | 15 + extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch | 26 ++ extra/tamu-anova/PKGBUILD | 30 ++ extra/tamu-anova/tamu-anova.install | 18 ++ extra/telepathy-haze/PKGBUILD | 13 +- extra/xulrunner/PKGBUILD | 49 +-- 26 files changed, 887 insertions(+), 143 deletions(-) create mode 100644 extra/avahi/install create mode 100644 extra/avahi/rc.d.patch create mode 100644 extra/gimp-devel/uri-backend-libcurl.patch create mode 100644 extra/gimp/uri-backend-libcurl.patch create mode 100644 extra/gjs/gjs-0.7.14-js185-backport.patch create mode 100644 extra/js/PKGBUILD create mode 100644 extra/js/js185-destdir.patch create mode 100644 extra/qtiplot/qtiplot-0.9.8.6-gold.patch create mode 100644 extra/qtiplot/qtiplot-0.9.8.6-kde.patch create mode 100644 extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch create mode 100644 extra/tamu-anova/PKGBUILD create mode 100644 extra/tamu-anova/tamu-anova.install (limited to 'extra') diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 63f079778..812aeeaa0 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126809 2011-06-07 12:12:31Z bisson $ +# $Id: PKGBUILD 128481 2011-06-24 03:51:45Z bisson $ # Contributor: Douglas Soares de Andrade # Maintainer: Gaetan Bisson pkgname=avahi pkgver=0.6.30 -pkgrel=3 +pkgrel=4 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') url='http://www.avahi.org/' @@ -22,23 +22,23 @@ optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' 'gtk-sharp-2' 'gobject-introspection' 'gtk3') backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) -install=avahi.install +install=install conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') replaces=('howl' 'mdnsresponder') options=('!libtool') source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'avahi-daemon-dbus.patch' - 'gnome-nettool.png') + 'gnome-nettool.png' + 'rc.d.patch') sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' - '36735096a6eeb3a4012fe14f875259ee8558e220' - 'cf56387c88aed246b9f435efc182ef44de4d52f3') + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i "../avahi-daemon-dbus.patch" + patch -p1 -i "../rc.d.patch" # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ diff --git a/extra/avahi/install b/extra/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/extra/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat < The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/extra/avahi/rc.d.patch b/extra/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/extra/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD index 16ede8148..a7667f16d 100644 --- a/extra/gimp-devel/PKGBUILD +++ b/extra/gimp-devel/PKGBUILD @@ -1,45 +1,48 @@ -# $Id: PKGBUILD 119839 2011-04-15 18:55:33Z eric $ +# $Id: PKGBUILD 130357 2011-07-05 18:03:52Z eric $ # Maintainer: Eric Bélanger pkgname=gimp-devel pkgver=2.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Image Manipulation Program (Development Version)" arch=('i686' 'x86_64') url="http://www.gimp.org/" -license=('GPL') -depends=('gtk2' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ - 'libexif' 'pygtk' 'desktop-file-utils' 'gegl' 'hicolor-icon-theme') -makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \ - 'pkg-config' 'alsa-lib' 'iso-codes') +license=('GPL3' 'LGPL3') +depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \ + 'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' - 'libwebkit: for the help browser' + 'libwebkit: for the help browser or web-page plug-ins' 'poppler-glib: for pdf support' - 'alsa-lib: for MIDI event controller module') + 'alsa-lib: for MIDI event controller module' + 'curl: for URI support') options=('!libtool' '!makeflags') conflicts=('gimp') provides=("gimp=${pkgver}") install=gimp-devel.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl) +source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl + uri-backend-libcurl.patch) md5sums=('6996138ab70b0bfebfe9f563284e5f78' - 'bb27bc214261d36484093e857f015f38') + 'bb27bc214261d36484093e857f015f38' + 'b3f8faa246e5794b0d63583059f54698') sha1sums=('4690420961d110f99448c32fe61aae7d4869a863' - '110ce9798173b19a662d086ed7b882b4729f06cf') + '110ce9798173b19a662d086ed7b882b4729f06cf' + '8a87adc11ee13d5fce79ea4226f04e682a2af97d') build() { cd "${srcdir}/gimp-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + patch -p1 < ../uri-backend-libcurl.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ - --enable-python --with-gif-compression=lzw \ - --without-aa --without-hal + --enable-python --with-gif-compression=lzw --with-libcurl \ + --without-aa --without-hal --without-gvfs make } package() { cd "${srcdir}/gimp-${pkgver}" - make DESTDIR="${pkgdir}" install-strip + make DESTDIR="${pkgdir}" install sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py - install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" diff --git a/extra/gimp-devel/uri-backend-libcurl.patch b/extra/gimp-devel/uri-backend-libcurl.patch new file mode 100644 index 000000000..d3217a292 --- /dev/null +++ b/extra/gimp-devel/uri-backend-libcurl.patch @@ -0,0 +1,44 @@ +diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c +--- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200 ++++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200 +@@ -24,7 +23,6 @@ + #include + + #include +-#include + #include + + #include +@@ -63,7 +61,7 @@ + + vinfo = curl_version_info (CURLVERSION_NOW); + +- protocols = g_string_new ("http:,ftp:"); ++ protocols = g_string_new ("http:,ftp:,gopher:"); + + if (vinfo->features & CURL_VERSION_SSL) + { +@@ -153,7 +151,7 @@ + FILE *out_file; + CURL *curl_handle; + CURLcode result; +- gint response_code; ++ glong response_code; + + gimp_progress_init (_("Connecting to server")); + +@@ -195,12 +193,12 @@ + + curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code); + +- if (response_code != 200) ++ if (response_code != 200 && response_code != 226 && response_code != 0) + { + fclose (out_file); + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Opening '%s' for reading resulted in HTTP " +- "response code: %d"), ++ "response code: %ld"), + uri, response_code); + curl_easy_cleanup (curl_handle); + return FALSE; diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index c0bab91ef..a04de0a07 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,42 +1,46 @@ -# $Id: PKGBUILD 119782 2011-04-15 08:31:34Z jgc $ +# $Id: PKGBUILD 130354 2011-07-05 17:55:54Z eric $ # Maintainer: tobias pkgname=gimp pkgver=2.6.11 -pkgrel=5 +pkgrel=6 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/" -license=('GPL') -depends=('gtk2' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ - 'libexif' 'pygtk' 'desktop-file-utils' 'gegl') -makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \ - 'pkg-config' 'alsa-lib' 'iso-codes') +license=('GPL' 'LGPL') +depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ + 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'libwebkit: for the help browser' 'poppler-glib: for pdf support' - 'alsa-lib: for MIDI event controller module') + 'alsa-lib: for MIDI event controller module' + 'curl: for URI support') options=('!libtool' '!makeflags') conflicts=('gimp-devel') install=gimp.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl) +source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl + uri-backend-libcurl.patch) md5sums=('bb2939fe13e54fc7255cef5d097bb5dd' - 'bb27bc214261d36484093e857f015f38') + 'bb27bc214261d36484093e857f015f38' + 'e894f4b2ffa92c71448fdd350e9b78c6') sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c' - '110ce9798173b19a662d086ed7b882b4729f06cf') + '110ce9798173b19a662d086ed7b882b4729f06cf' + 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + patch -p1 < ../uri-backend-libcurl.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ - --enable-python --with-gif-compression=lzw \ - --without-aa --without-hal + --enable-python --with-gif-compression=lzw --with-libcurl \ + --without-aa --without-hal --without-gvfs --without-gnomevfs make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install-strip + make DESTDIR="${pkgdir}" install sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" diff --git a/extra/gimp/uri-backend-libcurl.patch b/extra/gimp/uri-backend-libcurl.patch new file mode 100644 index 000000000..85da2fc7f --- /dev/null +++ b/extra/gimp/uri-backend-libcurl.patch @@ -0,0 +1,77 @@ +diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c +--- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200 ++++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200 +@@ -4,9 +4,9 @@ + * libcurl backend for the URI plug-in + * Copyright (C) 2006 Mukund Sivaraman + * +- * This program is free software; you can redistribute it and/or modify ++ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or ++ * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, +@@ -15,8 +15,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program. If not, see . + */ + + #include "config.h" +@@ -24,7 +23,6 @@ + #include + + #include +-#include + #include + + #include +@@ -63,7 +61,7 @@ + + vinfo = curl_version_info (CURLVERSION_NOW); + +- protocols = g_string_new ("http:,ftp:"); ++ protocols = g_string_new ("http:,ftp:,gopher:"); + + if (vinfo->features & CURL_VERSION_SSL) + { +@@ -153,7 +151,7 @@ + FILE *out_file; + CURL *curl_handle; + CURLcode result; +- gint response_code; ++ glong response_code; + + gimp_progress_init (_("Connecting to server")); + +@@ -195,12 +193,12 @@ + + curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code); + +- if (response_code != 200) ++ if (response_code != 200 && response_code != 226 && response_code != 0) + { + fclose (out_file); + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Opening '%s' for reading resulted in HTTP " +- "response code: %d"), ++ "response code: %ld"), + uri, response_code); + curl_easy_cleanup (curl_handle); + return FALSE; +@@ -224,3 +222,10 @@ + + return FALSE; + } ++ ++gchar * ++uri_backend_map_image (const gchar *uri, ++ GimpRunMode run_mode) ++{ ++ return NULL; ++} diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index 34fd492d4..3ce7f9db8 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 117650 2011-04-04 14:59:48Z ibiru $ +# $Id: PKGBUILD 130216 2011-07-04 12:55:31Z ibiru $ # Maintainer: Ionut Biru pkgname=gjs pkgver=0.7.14 -pkgrel=1 +pkgrel=2 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64') url="http://live.gnome.org/Gjs" license=('GPL') -depends=('gobject-introspection' 'xulrunner') +depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') options=('!libtool') -source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3af6f449a505c419d4a0e5938737da8d1b9b09b33710cc1ac1edee2eaa86e348') +source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2 + gjs-0.7.14-js185-backport.patch) +sha256sums=('3af6f449a505c419d4a0e5938737da8d1b9b09b33710cc1ac1edee2eaa86e348' + 'b1fd3b8aa5978c5b60bfe39ce4298e67b9baa190d9cbf1a0ebe47af356197335') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|python|python2|' scripts/make-tests + patch -Np1 -i "${srcdir}/gjs-0.7.14-js185-backport.patch" + autoreconf -fi ./configure --prefix=/usr --disable-static make } diff --git a/extra/gjs/gjs-0.7.14-js185-backport.patch b/extra/gjs/gjs-0.7.14-js185-backport.patch new file mode 100644 index 000000000..b8b2082a3 --- /dev/null +++ b/extra/gjs/gjs-0.7.14-js185-backport.patch @@ -0,0 +1,436 @@ +From cef9c0835bfd8be105ff8905083d6b51d9010b8f Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Fri, 1 Apr 2011 21:04:57 +0200 +Subject: [PATCH 1/4] Conditionally adapt to JS_DestroyScript removal + +Upstream changed the behaviour of several things about JSScripts in +http://hg.mozilla.org/mozilla-central/rev/c919a7271ac1 + +We now have to use a JSObject instead of a JSScript in certain circumstances, +and we no longer have to call JS_DestroyScript which no longer exists + +https://bugzilla.gnome.org/show_bug.cgi?id=646471 + +Conflicts: + + configure.ac +--- + configure.ac | 1 + + modules/console.c | 6 ++++++ + 2 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 715f2c3..f81704b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -160,6 +160,7 @@ AC_CHECK_LIB([mozjs], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], + AC_CHECK_LIB([mozjs], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS]) + AC_CHECK_LIB([mozjs], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) + AC_CHECK_LIB([mozjs], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) ++AC_CHECK_LIB([mozjs], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) + + AC_MSG_CHECKING([for mozilla-js >= 2 ]) + if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then +diff --git a/modules/console.c b/modules/console.c +index 49f891b..e6945be 100644 +--- a/modules/console.c ++++ b/modules/console.c +@@ -161,7 +161,11 @@ gjs_console_interact(JSContext *context, + { + JSObject *object = JS_THIS_OBJECT(context, vp); + gboolean eof = FALSE; ++#ifdef HAVE_JS_DESTROYSCRIPT + JSScript *script = NULL; ++#else ++ JSObject *script = NULL; ++#endif + jsval result; + JSString *str; + GString *buffer = NULL; +@@ -219,8 +223,10 @@ gjs_console_interact(JSContext *context, + } + + next: ++#ifdef HAVE_JS_DESTROYSCRIPT + if (script) + JS_DestroyScript(context, script); ++#endif + g_string_free(buffer, TRUE); + } while (!eof); + +-- +1.7.5.4 + + +From 3c8396821c78e362c8b3a89a27dcf4d32e25ee05 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou +Date: Fri, 29 Apr 2011 01:01:03 +0200 +Subject: [PATCH 2/4] conditonally adapt to JS_BufferIsCompilableUnit changes + +Upstream added an argument to JS_BufferIsCompilableUnit in commit +http://hg.mozilla.org/mozilla-central/rev/a773890b676f +We now have to tell if the bytes are utf8 or not. + +https://bugzilla.gnome.org/show_bug.cgi?id=646471 +--- + configure.ac | 1 + + modules/console.c | 4 ++++ + 2 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f81704b..270bc46 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -161,6 +161,7 @@ AC_CHECK_LIB([mozjs], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [ + AC_CHECK_LIB([mozjs], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) + AC_CHECK_LIB([mozjs], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) + AC_CHECK_LIB([mozjs], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) ++AC_CHECK_LIB([mozjs], [JS_DecodeUTF8], AC_DEFINE([HAVE_JS_DECODEUTF8], [1], [Define if we have JS_DecodeUTF8]),, [$JS_LIBS]) + + AC_MSG_CHECKING([for mozilla-js >= 2 ]) + if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then +diff --git a/modules/console.c b/modules/console.c +index e6945be..8e20db3 100644 +--- a/modules/console.c ++++ b/modules/console.c +@@ -196,7 +196,11 @@ gjs_console_interact(JSContext *context, + g_string_append(buffer, temp_buf); + g_free(temp_buf); + lineno++; ++#ifdef HAVE_JS_DECODEUTF8 ++ } while (!JS_BufferIsCompilableUnit(context, JS_TRUE, object, buffer->str, buffer->len)); ++#else + } while (!JS_BufferIsCompilableUnit(context, object, buffer->str, buffer->len)); ++#endif + + script = JS_CompileScript(context, object, buffer->str, buffer->len, "typein", + startline); +-- +1.7.5.4 + + +From 00dd38de7ac8e82ac35c40909707fa91665c3102 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 5 May 2011 12:49:09 -0400 +Subject: [PATCH 3/4] JS_CLASS_TRACE is a preprocessor macro, can't use + AC_CHECK_LIB + +Conflicts: + + configure.ac +--- + configure.ac | 24 ++++++++++++++++++++++++ + 1 files changed, 24 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 270bc46..d259471 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -230,6 +230,30 @@ if test "$have_jslocale_to_unicode_const" = yes; then + AC_DEFINE([JS_LOCALETOUNICODE_NEEDS_CONST_CHAR], [1], [Define if JSLocaleToUnicode takes a const char* for its src]) + fi + ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS $JS_CFLAGS" ++AC_MSG_CHECKING([for JS_CLASS_TRACE macro]) ++AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[ ++ #include ++ #ifndef JS_CLASS_TRACE ++ #error "No JS_CLASS_TRACE" ++ #endif ++ ]], ++ [[(void) 0;]] ++ )], ++ [have_js_class_trace=yes], ++ [have_js_class_trace=no]) ++ ++if test "x$have_js_class_trace" = xyes; then ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE([HAVE_JS_CLASS_TRACE], [1], [Define if we still have JS_CLASS_TRACE]) ++else ++ AC_MSG_RESULT([no]) ++fi ++CFLAGS="$save_CFLAGS" ++ + common_packages="gobject-2.0 >= gobject_required_version $JS_PACKAGE" + gjs_packages="gmodule-2.0 gthread-2.0 $common_packages" + gjs_gi_packages="gobject-introspection-1.0 >= 0.10.1 $common_packages" +-- +1.7.5.4 + + +From 5553cdd691ffddae3e3ffa5cc75e6575a237d0b7 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Wed, 4 May 2011 14:14:18 -0400 +Subject: [PATCH 4/4] Support compilation with standalone mozjs185 release + +Adjust the detection logic so that we look for mozjs-185.pc first. If +we have this, we can skip all kinds of insanity. + +See https://bugzilla.mozilla.org/show_bug.cgi?id=628723 +for the discussion about creating this release. + +https://bugzilla.gnome.org/show_bug.cgi?id=646369 + +Conflicts: + + configure.ac +--- + configure.ac | 218 ++++++++++++++++++++++++++++++++-------------------------- + 1 files changed, 121 insertions(+), 97 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d259471..cb54ffc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,124 +91,148 @@ m4_define(gobject_required_version, 2.18.0) + AC_CHECK_HEADERS([malloc.h]) + AC_CHECK_FUNCS(mallinfo) + +-# Look for Spidermonkey. If js-config exists, use that; +-# otherwise we try some pkgconfig files from various distributions. ++# First, try separate mozjs185 release ++AC_MSG_CHECKING([for standalone mozjs]) ++PKG_CHECK_EXISTS([mozjs185], JS_PACKAGE=mozjs185,) ++if test x$JS_PACKAGE != x; then ++ FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE` ++ MOZJS_IS_STANDALONE=yes ++ MOZJS_LIB=mozjs185 ++ AC_MSG_RESULT([yes]) ++ PKG_CHECK_MODULES(JS, $JS_PACKAGE) ++else ++ AC_MSG_RESULT([no]) ++ MOZJS_LIB=mozjs ++fi ++ ++# If we didn't find mozjs185 (the standalone spidermonkey); look for ++# one from Firefox/XULRunner. If js-config exists, use that; otherwise ++# we try some pkgconfig files from various distributions. + + AC_ARG_VAR([JS_CONFIG], [The js-config program to use]) +-if test "$ac_cv_env_JS_CONFIG_set" != "set"; then ++if test x$JS_PACKAGE = x && test "$ac_cv_env_JS_CONFIG_set" != "set"; then + AC_PATH_PROG([JS_CONFIG], [js-config], []) + fi + +-if test -n "$JS_CONFIG"; then +- JS_CFLAGS="$($JS_CONFIG --cflags)" +- JS_LIBS="$($JS_CONFIG --libs)" +- FIREFOX_JS_LIBDIR="$($JS_CONFIG --libdir)" +- JS_PACKAGE= +- +- # js-config gives almost usable CFLAGS, we must define one of XP_BEOS, +- # XP_OS2, XP_WIN or XP_UNIX +- JS_CFLAGS="$JS_CFLAGS -DXP_UNIX" +-else +- ## spidermonkey .pc file name varies across distributions and Gecko version +- ## +- ## mozilla-js: Gecko 1.9, all distributions +- ## xulrunner-js: Gecko 1.8 (and earlier?) Debian/Ubuntu +- ## firefox-js: ??? +- ## +- ## Checking for mozilla-js first will hopefully get us the newest version +- ## of spidermonkey. +- PKG_CHECK_EXISTS([mozilla-js], [JS_PACKAGE=mozilla-js], +- [PKG_CHECK_EXISTS([xulrunner-js], [JS_PACKAGE=xulrunner-js], [JS_PACKAGE=firefox-js])]) +- +- PKG_CHECK_MODULES(JS, $JS_PACKAGE) +- +- ## some flavors of Firefox .pc only set sdkdir, not libdir +- FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE` +- FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE` ++if test x$JS_PACKAGE = x; then ++ if test -n "$JS_CONFIG"; then ++ JS_CFLAGS="$($JS_CONFIG --cflags)" ++ JS_LIBS="$($JS_CONFIG --libs)" ++ FIREFOX_JS_LIBDIR="$($JS_CONFIG --libdir)" ++ JS_PACKAGE= ++ ++ # js-config gives almost usable CFLAGS, we must define one of XP_BEOS, ++ # XP_OS2, XP_WIN or XP_UNIX ++ JS_CFLAGS="$JS_CFLAGS -DXP_UNIX" ++ else ++ ## spidermonkey .pc file name varies across distributions and Gecko version ++ ## ++ ## mozilla-js: Gecko 1.9, all distributions ++ ## xulrunner-js: Gecko 1.8 (and earlier?) Debian/Ubuntu ++ ## firefox-js: ??? ++ ## ++ ## Checking for mozilla-js first will hopefully get us the newest version ++ ## of spidermonkey. ++ if test x$JS_PACKAGE = x; then ++ PKG_CHECK_EXISTS([mozilla-js], [JS_PACKAGE=mozilla-js],) ++ ++ fi ++ if test x$JS_PACKAGE = x; then ++ PKG_CHECK_EXISTS([xulrunner-js], [JS_PACKAGE=xulrunner-js]) ++ fi ++ if test x$JS_PACKAGE = x; then ++ PKG_CHECK_EXISTS([firefox-js], [JS_PACKAGE=firefox-js]) ++ fi ++ if test x$JS_PACKAGE = x; then ++ AC_MSG_ERROR([Unable to find spidermonkey package]) ++ fi ++ ++ PKG_CHECK_MODULES(JS, $JS_PACKAGE) ++ ++ ## some flavors of Firefox .pc only set sdkdir, not libdir ++ FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE` ++ FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE` ++ ++ ## Ubuntu does not set libdir in mozilla-js.pc ++ if test x"$FIREFOX_JS_LIBDIR" = x ; then ++ ## Ubuntu returns xulrunner-devel as the sdkdir, but for the ++ ## libdir we want the runtime location on the target system, ++ ## so can't use -devel. ++ ## The library is in the non-devel directory also. ++ ## Don't ask me why it's in two places. ++ FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'` ++ ++ if ! test -d "$FIREFOX_JS_LIBDIR" ; then ++ FIREFOX_JS_LIBDIR= ++ fi ++ fi ++ fi + +- ## Ubuntu does not set libdir in mozilla-js.pc + if test x"$FIREFOX_JS_LIBDIR" = x ; then +- ## Ubuntu returns xulrunner-devel as the sdkdir, but for the +- ## libdir we want the runtime location on the target system, +- ## so can't use -devel. +- ## The library is in the non-devel directory also. +- ## Don't ask me why it's in two places. +- FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'` +- +- if ! test -d "$FIREFOX_JS_LIBDIR" ; then +- FIREFOX_JS_LIBDIR= +- fi ++ AC_MSG_ERROR([Could not figure out where Firefox JavaScript library lives]) + fi +-fi + +-if test x"$FIREFOX_JS_LIBDIR" = x ; then +- AC_MSG_ERROR([Could not figure out where Firefox JavaScript library lives]) ++ ## workaround for Ubuntu Hardy bug where mozilla-js.pc gives CFLAGS ++ ## -I.../stable while jsapi.h is in .../unstable ++ AC_MSG_CHECKING([if SpiderMonkey needs extra compiler flags]) ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $JS_CFLAGS" ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]])], ++ [js_extra_cflags_needed=no], ++ [js_extra_cflags_needed=yes]) ++ CFLAGS="$save_CFLAGS" ++ AC_MSG_RESULT([$js_extra_cflags_needed]) ++ ++ JS_EXTRA_CFLAGS= ++ if test "$js_extra_cflags_needed" = yes; then ++ try_cflags="-I`$PKG_CONFIG --variable=includedir $JS_PACKAGE`/unstable" ++ AC_MSG_CHECKING([if $try_cflags works]) ++ save_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $JS_CFLAGS $try_cflags" ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]])], ++ [AC_MSG_RESULT([yes]) ++ JS_EXTRA_CFLAGS="$try_cflags"], ++ [AC_MSG_RESULT([no])]) ++ CFLAGS="$save_CFLAGS" ++ ++ if test x"$JS_EXTRA_CFLAGS" = x; then ++ AC_MSG_ERROR([Unable to determine extra compiler flags needed]) ++ fi ++ fi ++ AC_SUBST([JS_EXTRA_CFLAGS]) ++ ++ AC_MSG_CHECKING([for mozilla-js >= 1.9.2 ]) ++ if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 1.9.2`; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_ERROR([$JS_PACKAGE >= 1.9.2 is required]) ++ fi + fi + + AC_SUBST(JS_PACKAGE) + AC_SUBST(FIREFOX_JS_LIBDIR) + +-AC_MSG_CHECKING([for mozilla-js >= 1.9.2 ]) +-if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 1.9.2`; then +- AC_MSG_RESULT([yes]) +-else +- AC_MSG_ERROR([$JS_PACKAGE >= 1.9.2 is required]) +-fi +- +-AC_CHECK_LIB([mozjs], [JS_GetStringBytes], AC_DEFINE([HAVE_JS_GETSTRINGBYTES], [1], [Define if we still have JS_GetStringBytes]),, [$JS_LIBS]) +-AC_CHECK_LIB([mozjs], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], [1], [Define if we still have JS_GetFunctionName]),, [$JS_LIBS]) +-AC_CHECK_LIB([mozjs], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS]) +-AC_CHECK_LIB([mozjs], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) +-AC_CHECK_LIB([mozjs], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) +-AC_CHECK_LIB([mozjs], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) +-AC_CHECK_LIB([mozjs], [JS_DecodeUTF8], AC_DEFINE([HAVE_JS_DECODEUTF8], [1], [Define if we have JS_DecodeUTF8]),, [$JS_LIBS]) +- +-AC_MSG_CHECKING([for mozilla-js >= 2 ]) +-if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then +- AC_MSG_RESULT([yes]) +- AC_DEFINE(HAVE_MOZJS_2, [1], [Define if mozilla-js is at least 2]) +- AC_CHECK_LIB([mozjs], [JS_FreezeObject], AC_DEFINE([HAVE_JS_FREEZEOBJECT], [1], [Define if we have JS_FreezeObject]), ++AC_CHECK_LIB([$MOZJS_LIB], [JS_GetStringBytes], AC_DEFINE([HAVE_JS_GETSTRINGBYTES], [1], [Define if we still have JS_GetStringBytes]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], [1], [Define if we still have JS_GetFunctionName]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_CLASS_TRACE], AC_DEFINE([HAVE_JS_CLASS_TRACE], [1], [Define if we still have JS_CLASS_TRACE]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_DecodeUTF8], AC_DEFINE([HAVE_JS_DECODEUTF8], [1], [Define if we have JS_DecodeUTF8]),, [$JS_LIBS]) ++AC_CHECK_LIB([$MOZJS_LIB], [JS_FreezeObject], AC_DEFINE([HAVE_JS_FREEZEOBJECT], [1], [Define if we have JS_FreezeObject]), + , [$JS_LIBS]) +- AC_CHECK_LIB([mozjs], [JS_IsScriptFrame], AC_DEFINE([HAVE_JS_ISSCRIPTFRAME], [1], [Define if we have JS_IsScriptFrame]), ++AC_CHECK_LIB([$MOZJS_LIB], [JS_IsScriptFrame], AC_DEFINE([HAVE_JS_ISSCRIPTFRAME], [1], [Define if we have JS_IsScriptFrame]), + , [$JS_LIBS]) +- AC_CHECK_LIB([mozjs], [JS_EndPC], AC_DEFINE([HAVE_JS_ENDPC], [1], [Define if we have JS_EndPC]), ++AC_CHECK_LIB([$MOZJS_LIB], [JS_EndPC], AC_DEFINE([HAVE_JS_ENDPC], [1], [Define if we have JS_EndPC]), + , [$JS_LIBS]) +- AC_CHECK_LIB([mozjs], [JS_NewCompartmentAndGlobalObject], ++AC_CHECK_LIB([$MOZJS_LIB], [JS_NewCompartmentAndGlobalObject], + AC_DEFINE([HAVE_JS_NEWCOMPARTMENTANDGLOBALOBJECT], [1], [Define if we have JS_NewCompartmentAndGlobalObject]), + , [$JS_LIBS]) + +-else +- AC_MSG_RESULT([no]) +-fi +- +-## workaround for Ubuntu Hardy bug where mozilla-js.pc gives CFLAGS +-## -I.../stable while jsapi.h is in .../unstable +-AC_MSG_CHECKING([if SpiderMonkey needs extra compiler flags]) +-save_CFLAGS="$CFLAGS" +-CFLAGS="$CFLAGS $JS_CFLAGS" +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]])], +- [js_extra_cflags_needed=no], +- [js_extra_cflags_needed=yes]) +-CFLAGS="$save_CFLAGS" +-AC_MSG_RESULT([$js_extra_cflags_needed]) +- +-JS_EXTRA_CFLAGS= +-if test "$js_extra_cflags_needed" = yes; then +- try_cflags="-I`$PKG_CONFIG --variable=includedir $JS_PACKAGE`/unstable" +- AC_MSG_CHECKING([if $try_cflags works]) +- save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $JS_CFLAGS $try_cflags" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]])], +- [AC_MSG_RESULT([yes]) +- JS_EXTRA_CFLAGS="$try_cflags"], +- [AC_MSG_RESULT([no])]) +- CFLAGS="$save_CFLAGS" +- +- if test x"$JS_EXTRA_CFLAGS" = x; then +- AC_MSG_ERROR([Unable to determine extra compiler flags needed]) +- fi ++if test x$MOZJS_IS_STANDALONE = xyes || `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then ++ AC_DEFINE(HAVE_MOZJS_2, [1], [Define if mozilla-js is at least 2]) + fi +-AC_SUBST([JS_EXTRA_CFLAGS]) + + AC_MSG_CHECKING([whether JSLocaleToUnicode takes a const char*]) + save_CFLAGS="$CFLAGS" +-- +1.7.5.4 + diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index 9114b9fe4..4cc6d4027 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 115120 2011-03-17 01:42:57Z eric $ +# $Id: PKGBUILD 131183 2011-07-11 14:53:15Z ibiru $ # Maintainer: Jan de Groot pkgbase=gnome-python-extras -pkgname=('gnome-python-extras' 'python2-egg' 'python2-gda' 'python2-gdl' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkmozembed' 'python2-gtkspell') +pkgname=('gnome-python-extras' 'python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') pkgver=2.25.3 pkgrel=9 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') -makedepends=('libgtkhtml' 'gtkspell' 'gdl' 'xulrunner>=1.9.2' 'libgksu' 'libgnomeui' 'libgda' 'python2' 'pygtk' 'gnome-python') +makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'libgda' 'python2' 'pygtk' 'gnome-python') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2 gnome-python-extras-2.25.3-update-for-2.27.2.patch) @@ -19,12 +19,12 @@ build() { cd "${srcdir}/gnome-python-extras-${pkgver}" patch -Np1 -i "${srcdir}"/gnome-python-extras-2.25.3-update-for-2.27.2.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make MOZILLA_HOME=/usr/lib/xulrunner-2.0 + make } package_gnome-python-extras() { pkgdesc="Gnome Python interfaces for libraries not part of the core platform" - depends=('python2-egg' 'python2-gda' 'python2-gdl' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkmozembed' 'python2-gtkspell') + depends=('python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') cd "${srcdir}/gnome-python-extras-${pkgver}" make install-pkgconfigDATA DESTDIR="${pkgdir}" @@ -46,14 +46,6 @@ package_python2-gda(){ make -C gda install DESTDIR="${pkgdir}" } -package_python2-gdl() { - pkgdesc="Python bindings for gdl" - depends=('gdl' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gdl install DESTDIR="${pkgdir}" -} - package_python2-gksu2() { pkgdesc="Python bindings for the gksu2" depends=('libgksu' 'pygtk') @@ -70,14 +62,6 @@ package_python2-gtkhtml2() { make -C gtkhtml2 install DESTDIR="${pkgdir}" } -package_python2-gtkmozembed() { - pkgdesc="Python bindings for the gtkmozembed" - depends=('xulrunner>=1.9.2' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gtkmozembed install DESTDIR="${pkgdir}" -} - package_python2-gtkspell() { pkgdesc="Python bindings for the gtkspell" depends=('gtkspell' 'pygtk') diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 0c005f56e..b10afff70 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125332 2011-05-25 22:41:23Z ibiru $ +# $Id: PKGBUILD 130217 2011-07-04 12:56:15Z ibiru $ # Maintainer: Ionut Biru # Contributor: Flamelab +pkgname=js +pkgver=1.8.5 +pkgrel=1 +pkgdesc="JavaScript interpreter and libraries" +arch=(i686 x86_64) +url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" +license=('GPL2') +depends=('nspr' 'gcc-libs') +makedepends=('python2' 'zip') +replaces=('spidermonkey') +conflicts=('spidermonkey') +source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz + js185-destdir.patch) +md5sums=('a4574365938222adca0a6bd33329cb32' + '364834a8391888642c53d78c3a949d94') +build() { + cd "$srcdir/$pkgname-$pkgver/js/src" + patch -Np0 -i $srcdir/js185-destdir.patch + ./configure --prefix=/usr --with-system-nspr \ + --enable-threadsafe + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/js/src" + make DESTDIR="$pkgdir" install + + install -m 0755 shell/js ${pkgdir}/usr/bin + + #cleanup + rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/js/js185-destdir.patch b/extra/js/js185-destdir.patch new file mode 100644 index 000000000..87b7b53b3 --- /dev/null +++ b/extra/js/js185-destdir.patch @@ -0,0 +1,15 @@ +#https://bugzilla.mozilla.org/show_bug.cgi?id=628723 + +--- Makefile.in.old 2011-04-10 04:21:19.918608008 -0700 ++++ Makefile.in 2011-04-10 04:21:58.088607992 -0700 +@@ -888,8 +888,8 @@ + ifeq (,$(HOST_BIN_SUFFIX)) + mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) + @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) +- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) +- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) ++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) ++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) + endif + endif + ifneq (,$(IMPORT_LIBRARY)) diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 89d828938..208c30404 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 130178 2011-07-03 11:13:45Z giovanni $ +# $Id: PKGBUILD 131160 2011-07-11 12:44:25Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') url="http://www.selenic.com/mercurial" license=('GPL') depends=('python2') optdepends=('tk: for the hgk GUI') +backup=('etc/mercurial/hgrc') source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz mercurial.profile) md5sums=('d4842129fa2732eb6ed1180467bc32e2' '43e1d36564d4c7fbe9a091d3ea370a44') -build() { +package() { cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py install --root="${pkgdir}/" --optimize=1 @@ -38,4 +39,8 @@ build() { # set some variables install -m755 -d ${pkgdir}/etc/profile.d install -m755 ${srcdir}/mercurial.profile "${pkgdir}/etc/profile.d/mercurial.sh" + + # install configuration file + install -m755 -d ${pkgdir}/etc/mercurial + install -m644 contrib/sample.hgrc "${pkgdir}/etc/mercurial/hgrc" } diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index bec2671d7..072898ddc 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129948 2011-06-30 15:26:18Z giovanni $ +# $Id: PKGBUILD 131169 2011-07-11 13:15:58Z giovanni $ # Maintainer: Giovanni Scafora pkgname=mkvtoolnix -pkgver=4.8.0 -pkgrel=4 +pkgver=4.9.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=('47a730706f3da2bcf4ba62bba3a8f260') +md5sums=('3f92443fe7897abd3d5e7d61bd758432') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,7 +31,7 @@ build() { rake } -package () { +package() { cd "${srcdir}/${pkgname}-${pkgver}" rake DESTDIR="${pkgdir}" install diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index bbc0360f6..f02a11779 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124049 2011-05-16 10:05:58Z jgc $ +# $Id: PKGBUILD 130771 2011-07-07 22:43:35Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=pixman -pkgver=0.22.0 +pkgver=0.22.2 pkgrel=1 pkgdesc="Pixman library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d24ea233755d7dce9f0d93136ad99fba8d4e4fa0') +sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -20,14 +20,14 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index fcbe92107..758a6b582 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124052 2011-05-16 10:27:13Z jgc $ +# $Id: PKGBUILD 130693 2011-07-07 17:38:24Z andyrtr $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.16.5 +pkgver=0.16.7 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -11,7 +11,7 @@ makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk options=('!libtool') url="http://poppler.freedesktop.org/" source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) -md5sums=('2b6e0c26b77a943df3b9bb02d67ca236') +md5sums=('3afa28e3c8c4f06b0fbca3c91e06394e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD index 03644f0cf..be97b60dc 100644 --- a/extra/qtiplot/PKGBUILD +++ b/extra/qtiplot/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 112432 2011-03-04 22:39:07Z eric $ +# $Id: PKGBUILD 131207 2011-07-11 21:16:26Z ronald $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Gergely Imreh pkgname=qtiplot -pkgver=0.9.8.2 -pkgrel=6 -pkgdesc="Data analysis and scientific plotting - free clone of Origin" +pkgver=0.9.8.6 +pkgrel=1 arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html" -depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat') +pkgdesc="Data analysis and scientific plotting - free clone of Origin" +depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') # build against qwtplot3d provided in the package ... # build against qwt provided in the package ... # as systemwide one doesn't provide all needed functions @@ -22,21 +22,32 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 build.conf.archlinux qwtplot3d_gcc.patch qtiplot.xml - qtiplot-0.9.7.14-system-liborigin.patch - gentoo-fix-origin-build-failure.patch) -md5sums=('e8335a8760e8c2ac044607d5a4bb80ca' '56bd53f4f1367c285086acb969f13348'\ - 'ad8affbd6f0d5cbdcde46c923ee2668a' '4fc37151dc30d5ca36fd7d891a8bc41b'\ - 'ab02c436ec2c04b1838cb5517383b4eb' '35683f3b32e1edcca0bb02c471d284e9'\ - 'fa7cfc5ba60d28f264ad53869d31fcc8' '642cb38c6579b51b86834c8640130b6f') -sha1sums=('dd8d1003cee8767d4ba9e616e5263da1302c290d' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'\ - '4301cb2a36024a10108b689990d28c4fe5c7416e' '7afcdd4eca157f55e3ec4276712c466b3dc05106'\ - '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' '285f57d865956d93250ec548288c5bface096b6b'\ - '86899322f259be8594399642170f3f642d7f5f75' '9d6373fd9c0d1061796d1b920981124b6e9a49cf') + qtiplot-0.9.8.6-gold.patch + qtiplot-0.9.8.6-kde.patch + qtiplot-0.9.8.6-tamuanova.patch) +sha1sums=('e8a5ea1e1fb0e87cf76985f63b25e263b03f5fa9' + '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' + '4301cb2a36024a10108b689990d28c4fe5c7416e' + 'b3af6c866b3e63b537b418b6d00e57ef468f8f2b' + '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909' + '285f57d865956d93250ec548288c5bface096b6b' + 'b534a609f317cf3117d6495909854cdacea20124' + 'a1d4bec744c9b8fe29bf177851e66c97cdd9d975' + '830b518e3ef63625df84363a8047417124f243b0') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/qtiplot-0.9.7.14-system-liborigin.patch" - patch -Np0 -i "${srcdir}/gentoo-fix-origin-build-failure.patch" + + # gentoo fixes + patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch" + patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch" + patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch" + + # build also static qwtplot3d lib + echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro + + # install build configuration file install -Dm644 "${srcdir}/build.conf.archlinux" build.conf # Make qwt @@ -76,3 +87,5 @@ package() { install -D -m644 "${srcdir}/${pkgname}.xml" \ "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" } + + diff --git a/extra/qtiplot/build.conf.archlinux b/extra/qtiplot/build.conf.archlinux index 2cab47f9c..342377578 100644 --- a/extra/qtiplot/build.conf.archlinux +++ b/extra/qtiplot/build.conf.archlinux @@ -16,6 +16,8 @@ QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 LIB_ORIGIN_LIBS = -lorigin2 QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine +TAMUANOVA_LIBS = -ltamuanova +TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova PYTHON = python2 LUPDATE = lupdate diff --git a/extra/qtiplot/qtiplot-0.9.8.6-gold.patch b/extra/qtiplot/qtiplot-0.9.8.6-gold.patch new file mode 100644 index 000000000..3b6757533 --- /dev/null +++ b/extra/qtiplot/qtiplot-0.9.8.6-gold.patch @@ -0,0 +1,15 @@ + qtiplot/qtiplot.pro | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro +index 99e0e36..b7cf373 100755 +--- a/qtiplot/qtiplot.pro ++++ b/qtiplot/qtiplot.pro +@@ -20,6 +20,7 @@ LIBS += $$MUPARSER_LIBS + LIBS += $$QWT_LIBS + LIBS += $$QWT3D_LIBS + LIBS += $$GSL_LIBS ++LIBS += -lz + + ############################################################################# + ###################### BASIC PROJECT PROPERTIES ############################# diff --git a/extra/qtiplot/qtiplot-0.9.8.6-kde.patch b/extra/qtiplot/qtiplot-0.9.8.6-kde.patch new file mode 100644 index 000000000..919ec6cc2 --- /dev/null +++ b/extra/qtiplot/qtiplot-0.9.8.6-kde.patch @@ -0,0 +1,15 @@ + qtiplot/src/plot2D/Graph.cpp | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp +index 626172a..d4eab1b 100755 +--- a/qtiplot/src/plot2D/Graph.cpp ++++ b/qtiplot/src/plot2D/Graph.cpp +@@ -73,6 +73,7 @@ + #include + #include + ++#include + #include + #include + #include diff --git a/extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch new file mode 100644 index 000000000..1644266d1 --- /dev/null +++ b/extra/qtiplot/qtiplot-0.9.8.6-tamuanova.patch @@ -0,0 +1,26 @@ +diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro +index 95a5f0c..72e99ab 100755 +--- a/qtiplot/qtiplot.pro ++++ b/qtiplot/qtiplot.pro +@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) { + !isEmpty(TAMUANOVA_LIBS) { + DEFINES += HAVE_TAMUANOVA + INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH +- #LIBS += $$TAMUANOVA_LIBS +- +- HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h +- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c +- SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c ++ LIBS += $$TAMUANOVA_LIBS + } + + ############################################################### + + # At the very end: add global include- and lib path +-#unix:INCLUDEPATH += $$SYS_INCLUDEPATH +-#unix:LIBS += $$SYS_LIBS ++unix:INCLUDEPATH += $$SYS_INCLUDEPATH ++unix:LIBS += $$SYS_LIBS + + ############################################################### + ############### Building QtiPlot as a browser plugin ########## diff --git a/extra/tamu-anova/PKGBUILD b/extra/tamu-anova/PKGBUILD new file mode 100644 index 000000000..8b0df4485 --- /dev/null +++ b/extra/tamu-anova/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 131204 2011-07-11 21:05:04Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: Gergely Imreh + +pkgname=tamu-anova +pkgver=0.2.1 +pkgrel=1 +pkgdesc="ANOVA Extensions to the GNU Scientific Library" +arch=('x86_64' 'i686') +url="http://www.stat.tamu.edu/~aredd/tamuanova/" +license=('GPL') +depends=('gsl') +makedepends=('gcc') +install=tamu-anova.install +source=(http://www.stat.tamu.edu/~aredd/tamuanova/tamu_anova-0.2.tar.gz) +sha1sums=('8c7ffae14ebe92f27d20ff1f0e325875fa6ced53') + +build() { + cd ${srcdir}/tamu_anova-0.2 + ./configure --prefix=/usr --infodir=/usr/share/info --includedir=/usr/include + make +} + +package() { + cd ${srcdir}/tamu_anova-0.2 + make DESTDIR=${pkgdir} install + +} + + diff --git a/extra/tamu-anova/tamu-anova.install b/extra/tamu-anova/tamu-anova.install new file mode 100644 index 000000000..e0615b522 --- /dev/null +++ b/extra/tamu-anova/tamu-anova.install @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(tamu_anova.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD index 773a9277a..d2bce6be0 100644 --- a/extra/telepathy-haze/PKGBUILD +++ b/extra/telepathy-haze/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 86857 2010-08-05 17:22:25Z ibiru $ +# $Id: PKGBUILD 131178 2011-07-11 14:00:11Z ibiru $ # Maintainer: Ionut Biru # Contributor: Timm Preetz pkgname=telepathy-haze -pkgver=0.4.0 +pkgver=0.5.0 pkgrel=1 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols." arch=('i686' 'x86_64') @@ -13,14 +13,15 @@ makedepends=('libxslt') install=telepathy-haze.install groups=('telepathy') source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6e3e048cbee27aa37a64b8e9cc611664') +md5sums=('4378726d61e1e5df789a05760a94d172') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy make - make DESTDIR="${pkgdir}" install +} - #remove manager, upstream suggested and it would be removed in the near future - rm -rf "${pkgdir}/usr/share/telepathy/managers" +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index e94e120a8..1bf7cd3db 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,64 +1,47 @@ -# $Id: PKGBUILD 128075 2011-06-21 17:45:36Z ibiru $ +# $Id: PKGBUILD 131156 2011-07-11 11:19:22Z ibiru $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xulrunner -pkgver=2.0.1 -_ffoxver=4.0.1 -pkgrel=3 +pkgver=5.0 +_ffoxver=5.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') +makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'gconf') 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 - xulrunner-version.patch - xulrunner-omnijar.patch - port_gnomevfs_to_gio.patch) -options=('!emptydirs') + mozilla-pkgconfig.patch) +options=('!emptydirs' '!buildflags') replaces=('xulrunner-oss') -md5sums=('9abda7d23151e97913c8555a64c13f34' - '2358a2ddd35bcdd62ff42442dfe548d9' - '639ea80e823543dd415b90c0ee804186' - 'a0236f6c3e55f60b7888d8cf137ff209' - '0bf82bc6677e3ce57fd20a147fe8d7b1' - '42f83468b296452fb754a81a4317ca64') build() { - cd "${srcdir}/mozilla-2.0" + cd "${srcdir}/mozilla-release" cp "${srcdir}/mozconfig" .mozconfig #fix libdir/sdkdir - fedora patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch" - #Force installation to the same path for every version - patch -Np1 -i "${srcdir}/xulrunner-version.patch" - - #https://bugzilla.mozilla.org/show_bug.cgi?id=620931 - patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch" - - #https://bugzilla.mozilla.org/show_bug.cgi?id=494163 - patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch" - - unset CFLAGS - unset CXXFLAGS - export CXXFLAGS="-fpermissive" + export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } package() { - cd "${srcdir}/mozilla-2.0" + 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-2.0/dictionaries" - ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries" + rm -rf "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries" + ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries" # add xulrunner library path to ld.so.conf install -d ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf + echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf } +md5sums=('9f64a01e86a5d424e12a8e3305c5debe' + '2358a2ddd35bcdd62ff42442dfe548d9' + '639ea80e823543dd415b90c0ee804186') -- cgit v1.2.3-54-g00ecf