From ea3d877b99c32e3a9e00ab220440d4518430e5bc Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Apr 2012 00:01:18 +0000 Subject: Mon Apr 16 00:01:18 UTC 2012 --- libre/linux-libre/PKGBUILD | 6 +- libre/linux-libre/linux-libre.install | 2 +- libre/mariadb/PKGBUILD | 87 ++++++++++++----------- libre/mariadb/mysql.install | 26 +++++++ libre/mariadb/mysqld | 77 +++++++++++++++++++++ libre/xulrunner-libre/PKGBUILD | 99 +++++++++++++++++++++++++++ libre/xulrunner-libre/gcc47.patch | 44 ++++++++++++ libre/xulrunner-libre/mozconfig | 34 +++++++++ libre/xulrunner-libre/mozilla-pkgconfig.patch | 40 +++++++++++ 9 files changed, 366 insertions(+), 49 deletions(-) create mode 100644 libre/mariadb/mysql.install create mode 100644 libre/mariadb/mysqld create mode 100644 libre/xulrunner-libre/PKGBUILD create mode 100644 libre/xulrunner-libre/gcc47.patch create mode 100644 libre/xulrunner-libre/mozconfig create mode 100644 libre/xulrunner-libre/mozilla-pkgconfig.patch (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8dff63ec7..20fa125b5 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.3 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.0 # nearly always the same as pkgver -pkgrel=1.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5487da14ca81715a469c7594d39722fa' - '58799da6f62daf1e54a256d02792b91f' + 'b43d3bdecfa355bf45bd1154819e3687' '559487f3e438ad95f1c80aa11abf2ed0' 'f3749180b53d042091a483300ef04f8d' 'a8a3843046926eb7ab81312cd438c5c5' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6f0d7a347..861ce1f51 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.3.1-1.1-LIBRE +KERNEL_VERSION=3.3.2-1-LIBRE post_install () { # updating module dependencies diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index a87c3082a..df4bb9a16 100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD @@ -4,23 +4,23 @@ # Contributor: Douglas Soares de Andrade # Maintainer (Parabola): Márcio Silva -_falsename=mysql -__falsename=MySQL +falsename=mysql +_falsename=MySQL pkgbase=mariadb _pkgbase=MariaDB pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") pkgver=5.5.23 -pkgrel=2 +pkgrel=1.4 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.${pkgbase}.org/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgbase}-${pkgver}.tar.gz" - "${pkgbase}d" + "${falsename}d" 'my.cnf') md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' - '4c491570ec9f2db20b080082119a1714' + '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') build() { @@ -35,22 +35,22 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/${pkgbase} \ - -DMYSQL_DATADIR=/var/lib/${pkgbase} \ - -DMYSQL_UNIX_ADDR=/var/run/${pkgbase}/${pkgbase}.sock \ + -DSYSCONFDIR=/etc/${falsename} \ + -DMYSQL_DATADIR=/var/lib/${falsename} \ + -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ -DDEFAULT_CHARSET=utf8 \ -DDEFAULT_COLLATION=utf8_general_ci \ -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/${pkgbase}/docs \ + -DINSTALL_INFODIR=share/${falsename}/docs \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/${pkgbase}/plugin \ + -DINSTALL_PLUGINDIR=/usr/lib/${falsename}/plugin \ -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/${pkgbase} \ - -DINSTALL_DOCREADMEDIR=share/${pkgbase} \ - -DINSTALL_SUPPORTFILESDIR=share/${pkgbase} \ - -DINSTALL_MYSQLSHAREDIR=share/${pkgbase} \ - -DINSTALL_DOCDIR=share/${pkgbase}/docs \ - -DINSTALL_SHAREDIR=share/${pkgbase} \ + -DINSTALL_INCLUDEDIR=include/${falsename} \ + -DINSTALL_DOCREADMEDIR=share/${falsename} \ + -DINSTALL_SUPPORTFILESDIR=share/${falsename} \ + -DINSTALL_MYSQLSHAREDIR=share/${falsename} \ + -DINSTALL_DOCDIR=share/${falsename}/docs \ + -DINSTALL_SHAREDIR=share/${falsename} \ -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ @@ -69,75 +69,72 @@ build() { } package_libmariadbclient(){ - pkgdesc="${_pkgbase} client libraries (branch of ${__falsename})" + pkgdesc="${_pkgbase} client libraries (branch of ${_falsename})" depends=('openssl') - replaces=("lib${_falsename}client") - conflicts=("lib${_falsename}client") - provides=("lib${_falsename}client=${pkgver}") + conflicts=("lib${falsename}client") + provides=("lib${falsename}client=${pkgver}") cd "${srcdir}"/build - for dir in include lib${_falsename} lib${_falsename}d libservices; do + for dir in include lib${falsename} lib${falsename}d libservices; do make -C ${dir} DESTDIR="${pkgdir}" install done install -d "${pkgdir}"/usr/bin - install -m755 scripts/${_falsename}_config "${pkgdir}"/usr/bin/ + install -m755 scripts/${falsename}_config "${pkgdir}"/usr/bin/ install -d "${pkgdir}"/usr/share/man/man1 - for man in ${_falsename}_config ${_falsename}_client_test_embedded ${_falsename}test_embedded; do + for man in ${falsename}_config ${falsename}_client_test_embedded ${falsename}test_embedded; do install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done } package_mariadb-clients(){ - pkgdesc="${_pkgbase} client tools (branch of ${__falsename})" + pkgdesc="${_pkgbase} client tools (branch of ${_falsename})" depends=("lib${pkgbase}client") - replaces=("${_falsename}-clients") - conflicts=("${_falsename}-clients") - provides=("${_falsename}-clients=${pkgver}") + conflicts=("${falsename}-clients") + provides=("${falsename}-clients=${pkgver}") cd "${srcdir}"/build make -C client DESTDIR="${pkgdir}" install # install man pages install -d "${pkgdir}"/usr/share/man/man1 - for man in ${_falsename} ${_falsename}admin ${_falsename}check ${_falsename}dump ${_falsename}import ${_falsename}show ${_falsename}slap; do + for man in ${falsename} ${falsename}admin ${falsename}check ${falsename}dump ${falsename}import ${falsename}show ${falsename}slap; do install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done # provided by mariadb - rm "${pkgdir}"/usr/bin/{${_falsename}_{plugin,upgrade},${_falsename}binlog,${_falsename}test} + rm "${pkgdir}"/usr/bin/{${falsename}_{plugin,upgrade},${falsename}binlog,${falsename}test} } package_mariadb(){ - pkgdesc="A fast SQL database server branch of ${__falsename} - ${_pkgbase}" + pkgdesc="A fast SQL database server branch of ${_falsename} - ${_pkgbase}" backup=("etc/${pkgbase}/my.cnf") - install=${pkgbase}.install + install=${falsename}.install depends=("${pkgbase}-clients") - optdepends=('perl-dbi' "perl-dbd-${_falsename}") - replaces=("${_falsename}") - conflicts=("${_falsename}") - provides=("${_falsename}=${pkgver}") + optdepends=('perl-dbi' "perl-dbd-${falsename}") + conflicts=("${falsename}") + provides=("${falsename}=${pkgver}") options=('emptydirs') cd "${srcdir}"/build make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${pkgbase}/my.cnf - install -Dm755 "${srcdir}"/${pkgbase}d "${pkgdir}"/etc/rc.d/${pkgbase}d + install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/${falsename}/my.cnf + install -Dm755 "${srcdir}"/${falsename}d "${pkgdir}"/etc/rc.d/${falsename}d # provided by libmariadbclient - rm "${pkgdir}"/usr/bin/{${_falsename}_config,${_falsename}_client_test_embedded,${_falsename}test_embedded} - rm "${pkgdir}"/usr/lib/lib${_falsename}* + rm "${pkgdir}"/usr/bin/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded} + rm "${pkgdir}"/usr/lib/lib${falsename}* rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{${_falsename}_config,${_falsename}_client_test_embedded,${_falsename}test_embedded}.1 + rm "${pkgdir}"/usr/share/man/man1/{${falsename}_config,${falsename}_client_test_embedded,${falsename}test_embedded}.1 # provided by mariadb-clients - rm "${pkgdir}"/usr/bin/{${_falsename},${_falsename}admin,${_falsename}check,${_falsename}dump,${_falsename}import,${_falsename}show,${_falsename}slap} - rm "${pkgdir}"/usr/share/man/man1/{${_falsename},${_falsename}admin,${_falsename}check,${_falsename}dump,${_falsename}import,${_falsename}show,${_falsename}slap}.1 + rm "${pkgdir}"/usr/bin/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap} + rm "${pkgdir}"/usr/share/man/man1/{${falsename},${falsename}admin,${falsename}check,${falsename}dump,${falsename}import,${falsename}show,${falsename}slap}.1 # not needed - rm -r "${pkgdir}"/usr/{data,${_falsename}-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/${_falsename}-test-run.pl.1 + rm -r "${pkgdir}"/usr/{data,${falsename}-test,sql-bench} + rm "${pkgdir}"/usr/share/man/man1/${falsename}-test-run.pl.1 - install -dm700 "${pkgdir}"/var/lib/${pkgbase} + install -dm700 "${pkgdir}"/var/lib/${falsename} } diff --git a/libre/mariadb/mysql.install b/libre/mariadb/mysql.install new file mode 100644 index 000000000..9a4479215 --- /dev/null +++ b/libre/mariadb/mysql.install @@ -0,0 +1,26 @@ +post_install(){ + groupadd -g 89 mysql &>/dev/null + useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + usr/bin/mysql_install_db --user=mysql --basedir=/usr + chown -R mysql:mysql var/lib/mysql &>/dev/null +} + +post_upgrade(){ + getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null + getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null + + if [ "$(vercmp $2 5.5)" -lt 0 ]; then + echo " >> " + echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." + echo " >> " + fi +} + +post_remove(){ + if getent passwd mysql >/dev/null 2>&1; then + userdel mysql + fi + if getent group mysql >/dev/null 2>&1; then + groupdel mysql + fi +} diff --git a/libre/mariadb/mysqld b/libre/mariadb/mysqld new file mode 100644 index 000000000..1ac88a7cc --- /dev/null +++ b/libre/mariadb/mysqld @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MySQL Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MySQL Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD new file mode 100644 index 000000000..4d39c9116 --- /dev/null +++ b/libre/xulrunner-libre/PKGBUILD @@ -0,0 +1,99 @@ +# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $ +# Maintainer: Jan de Groot +# Contributor: Alexander Baldeck + +# With many changes from iceweasel-libre. + +# We're getting this from Debian Sid +_debname=iceweasel +_debver=11.0 +_debrel=2 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=xulrunner +pkgname=xulrunner-libre +pkgver=${_debver}.${_debrel} +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64' 'mips64el') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" + mozconfig + mozilla-pkgconfig.patch + gcc47.patch) +options=('!emptydirs') +conflicts=('xulrunner') +provides=("xulrunner=${_debver}") +replaces=('xulrunner-oss' 'xulrunner') +md5sums=('01d9d18909ca9fff2483d8fd779a0f89' + '59349da94b095fe0623d09ce75696766' + 'f407208a750cdc9bea3a6a3a3e42dd89' + '6277c508cf24a78c596decae2e568997' + '27271ce647a83906ef7a24605e840d61' + 'aeaf587f7a962ebcc81515e1f1706cd1') + +dpkg-source() { + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_debname}-${_debver}" + mv debian "${_debname}-${_debver}" + cd "${_debname}-${_debver}" + +# Doesn't apply and seems unimportant + rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true + + quilt push -a + find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? + cd .. +} + +build() { +# Don't run this if we're using -e +if [ $NOEXTRACT -eq 0 ]; then + msg2 "Applying Debian patches..." + cd "${srcdir}" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + + msg2 "Starting normal build..." + mv "${_debname}-${_debver}" "$srcdir/mozilla-release" + cd "$srcdir/mozilla-release" + + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/gcc47.patch" +fi + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver}" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver}/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver}/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-${_debver}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/header.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/typelib.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-${_debver}/sdk/bin/xpidl.py" +} diff --git a/libre/xulrunner-libre/gcc47.patch b/libre/xulrunner-libre/gcc47.patch new file mode 100644 index 000000000..5bdd36c6f --- /dev/null +++ b/libre/xulrunner-libre/gcc47.patch @@ -0,0 +1,44 @@ +--- mozilla-release.orig/ipc/chromium/src/base/file_util.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/file_util.cc 2012-04-04 18:50:02.094431651 -0300 +@@ -8,7 +8,7 @@ + #include + #endif + #include +-#if defined(ANDROID) ++#if defined(ANDROID) || defined(OS_POSIX) + #include + #endif + +--- mozilla-release.orig/ipc/chromium/src/base/message_pump_libevent.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/message_pump_libevent.cc 2012-04-04 19:55:24.140455837 -0300 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "eintr_wrapper.h" + #include "base/logging.h" + +--- mozilla-release.orig/ipc/chromium/src/base/file_util_linux.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/file_util_linux.cc 2012-04-04 20:49:49.756138306 -0300 +@@ -5,6 +5,7 @@ + #include "base/file_util.h" + + #include ++#include + + #include + #include + +--- mozilla-release.orig/ipc/chromium/src/base/time_posix.cc 2012-03-06 14:26:03.000000000 -0200 ++++ mozilla-release/ipc/chromium/src/base/time_posix.cc 2012-04-04 20:55:12.678037291 -0300 +@@ -8,6 +8,7 @@ + #include + #endif + #include ++#include + #ifdef ANDROID + #include + #else + diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig new file mode 100644 index 000000000..d6cc06648 --- /dev/null +++ b/libre/xulrunner-libre/mozconfig @@ -0,0 +1,34 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/libre/xulrunner-libre/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE -- cgit v1.2.3-54-g00ecf