Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=39da1a3c6e712bcb51f2a6ab3d896f2641dca1fd
commit 39da1a3c6e712bcb51f2a6ab3d896f2641dca1fd Author: bouleetbil <[email protected]> Date: Tue Jul 5 12:06:12 2011 +0200 libproxy-0.4.7-1-x86_64 *version bump *disable xulrunner support *Only support mozjs185 as valid mozilla pacrunner backend. *Xulrunner is no longer trackable from upstream due to the lightning *fast movement of the Firefox source base. Also, Mozilla does not *support usage of xulrunner from other apps. diff --git a/source/lib/libproxy/FrugalBuild b/source/lib/libproxy/FrugalBuild index 72be664..13edfbe 100644 --- a/source/lib/libproxy/FrugalBuild +++ b/source/lib/libproxy/FrugalBuild @@ -2,15 +2,18 @@ # Maintainer: bouleetbil <[email protected]> pkgname=libproxy -pkgver=0.4.6 -pkgrel=3 +pkgver=0.4.7 +pkgrel=1 pkgdesc="libproxy is a library that provides automatic proxy configuration management." -depends=('glibc' 'dbus') +depends=('webkit-gtk3' 'libuuid') makedepends=('automoc4') groups=('lib') archs=('i686' 'x86_64' 'ppc') +replaces=('libproxy-perl' 'libproxy-webkit' 'libproxy-xulrunner') Finclude googlecode cmake python -sha1sums=('6e9745c87b774f34bf53f07a54284c0d72020e94') +source=($source xul.diff) +sha1sums=('b01ebbdf837babf63f38ee34e261d76f23dad319' \ + '2173fc3f9b5eada92172be97f62d9a6e4f812352') subpkgs=("${subpkgs[@]}" "$pkgname-python") subdescs=("${subdescs[@]}" "$pkgname python binding") @@ -19,19 +22,19 @@ subrodepends=("${subrodepends[@]}" "$pkgname") subgroups=("${subgroups[@]}" 'lib') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') -subpkgs=("${subpkgs[@]}" "$pkgname-webkit") -subdescs=("${subdescs[@]}" "$pkgname webkit support") -subdepends=("${subdepends[@]}" "webkit") -subrodepends=("${subrodepends[@]}" "$pkgname") -subgroups=("${subgroups[@]}" 'xlib-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +#subpkgs=("${subpkgs[@]}" "$pkgname-webkit") +#subdescs=("${subdescs[@]}" "$pkgname webkit support") +#subdepends=("${subdepends[@]}" "webkit-gtk3") +#subrodepends=("${subrodepends[@]}" "$pkgname") +#subgroups=("${subgroups[@]}" 'xlib-extra') +#subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') -subpkgs=("${subpkgs[@]}" "$pkgname-xulrunner") -subdescs=("${subdescs[@]}" "$pkgname xulrunner support") -subdepends=("${subdepends[@]}" "xulrunner") -subrodepends=("${subrodepends[@]}" "$pkgname") -subgroups=("${subgroups[@]}" 'xlib-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +#subpkgs=("${subpkgs[@]}" "$pkgname-xulrunner") +#subdescs=("${subdescs[@]}" "$pkgname xulrunner support") +#subdepends=("${subdepends[@]}" "xulrunner") +#subrodepends=("${subrodepends[@]}" "$pkgname") +#subgroups=("${subgroups[@]}" 'xlib-extra') +#subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') #subpkgs=("${subpkgs[@]}" "$pkgname-kde") #subdescs=("${subdescs[@]}" "$pkgname kde support") @@ -42,7 +45,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') subpkgs=("${subpkgs[@]}" "$pkgname-gnome") subdescs=("${subdescs[@]}" "$pkgname gnome support") -subdepends=("${subdepends[@]}" "gconf") +subdepends=("${subdepends[@]}" "glib2") subrodepends=("${subrodepends[@]}" "$pkgname") subgroups=("${subgroups[@]}" 'gnome') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -54,16 +57,16 @@ subrodepends=("${subrodepends[@]}" "$pkgname") subgroups=("${subgroups[@]}" 'lib-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') -subpkgs=("${subpkgs[@]}" "$pkgname-perl") -subdescs=("${subdescs[@]}" "$pkgname perl support") -subdepends=("${subdepends[@]}" "perl") -subrodepends=("${subrodepends[@]}" "$pkgname") -subgroups=("${subgroups[@]}" 'lib-extra') -subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +#subpkgs=("${subpkgs[@]}" "$pkgname-perl") +#subdescs=("${subdescs[@]}" "$pkgname perl support") +#subdepends=("${subdepends[@]}" "perl") +#subrodepends=("${subrodepends[@]}" "$pkgname") +#subgroups=("${subgroups[@]}" 'lib-extra') +#subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') subpkgs=("${subpkgs[@]}" "$pkgname-vala") subdescs=("${subdescs[@]}" "$pkgname vala support") -subdepends=("${subdepends[@]}" "vala") +subdepends=("${subdepends[@]}" "") subrodepends=("${subrodepends[@]}" "$pkgname") subgroups=("${subgroups[@]}" 'lib-extra') subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') @@ -73,16 +76,16 @@ subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') build() { Fcd CMake_build -Dmoduledir=/usr/lib/$pkgname/$pkgver/modules \ - -DWITH_VALA=yes - Fmv /usr/lib/perl5/site_perl/`perl -e 'printf "%vd", $^V'` /usr/lib/perl5/site_perl/current - Fsplit $pkgname-perl usr/lib/perl5 + -DWITH_VALA=yes -DWITH_WEBKIT3=ON -DWITH_PERL=OFF + #Fmv /usr/lib/perl5/site_perl/`perl -e 'printf "%vd", $^V'` /usr/lib/perl5/site_perl/current + #Fsplit $pkgname-perl usr/lib/perl5 Fsplit $pkgname-vala usr/share/vala Fsplit $pkgname-python $_F_python_libdir - Fsplit $pkgname-gnome usr/lib/$pkgname/$pkgver/modules/config_gnome.so - Fsplit $pkgname-gnome usr/libexec/pxgconf + Fsplit $pkgname-gnome usr/lib/$pkgname/$pkgver/modules/config_gnome3.so + Fsplit $pkgname-gnome usr/libexec/pxgsettings Fsplit $pkgname-networkmanager usr/lib/$pkgname/$pkgver/modules/network_networkmanager.so - Fsplit $pkgname-webkit usr/lib/$pkgname/$pkgver/modules/pacrunner_webkit.so - Fsplit $pkgname-xulrunner usr/lib/$pkgname/$pkgver/modules/pacrunner_mozjs.so + #Fsplit $pkgname-webkit usr/lib/$pkgname/$pkgver/modules/pacrunner_webkit.so + #Fsplit $pkgname-xulrunner usr/lib/$pkgname/$pkgver/modules/pacrunner_mozjs.so #Fsplit $pkgname-kde usr/lib/$pkgname/modules/$pkgver/config_kde.so } diff --git a/source/lib/libproxy/xul.diff b/source/lib/libproxy/xul.diff new file mode 100644 index 0000000..3cabe08 --- /dev/null +++ b/source/lib/libproxy/xul.diff @@ -0,0 +1,31 @@ +--- libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk.old 2011-06-06 23:44:37.000000000 +0200 ++++ libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk 2011-07-05 11:52:10.000000000 +0200 +@@ -7,20 +7,17 @@ + include_directories("${MOZJS_INCLUDE_DIR}") + endif() + elseif(NOT APPLE) +- set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order") + option(WITH_MOZJS "Search for MOZJS package" ON) + if (WITH_MOZJS) +- foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) +- pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) +- if(MOZJS_FOUND) +- include_directories(${MOZJS_INCLUDE_DIRS}) +- link_directories(${MOZJS_LIBRARY_DIRS}) +- break() +- else() +- set(MOZJS_FOUND 0) +- endif() +- endforeach() ++ pkg_search_module(MOZJS mozjs185>=1.8.5) ++ if(MOZJS_FOUND) ++ include_directories(${MOZJS_INCLUDE_DIRS}) ++ link_directories(${MOZJS_LIBRARY_DIRS}) ++ else() ++ set(MOZJS_FOUND 0) ++ endif() + else() + set(MOZJS_FOUND 0) + endif() + endif() ++ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
