From d676fe3f153e1ef8cb3a270afa48b65cb918189b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:11:38 +0200 Subject: [PATCH 01/27] webkit-gtk: update to 1.8.0. --- srcpkgs/webkit-gtk3/template | 11 +++++++---- srcpkgs/webkit-gtk3/webkit-gtk-devel.template | 4 ++-- srcpkgs/webkit-gtk3/webkit-gtk.rshlibs | 7 +++++++ srcpkgs/webkit-gtk3/webkit-gtk.template | 2 -- srcpkgs/webkit-gtk3/webkit-gtk3-devel.template | 5 ++--- srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs | 7 +++++++ 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template index a0a5a86647f..df0039a12d0 100644 --- a/srcpkgs/webkit-gtk3/template +++ b/srcpkgs/webkit-gtk3/template @@ -1,13 +1,13 @@ # Template file for 'webkit-gtk3' pkgname=webkit-gtk3 -version=1.6.3 +version=1.8.0 wrksrc=webkit-${version} homepage="http://webkitgtk.org/" license="LGPL-2.1, Simplified BSD (2 clause)" -distfiles="${homepage}/webkit-${version}.tar.xz" +distfiles="${homepage}/releases/webkit-${version}.tar.xz" short_desc="GTK+3 port of the WebKit browser engine" maintainer="Juan RP " -checksum=12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3 +checksum=8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc long_desc=" WebKit is an open source web browser engine. WebKit is also the name of the Mac OS X system framework version of the engine that's used by @@ -17,6 +17,7 @@ long_desc=" This is the GTK3+ port of the engine." +disable_parallel_build=yes subpackages="webkit-gtk webkit-gtk-devel $pkgname-devel" Add_dependency build perl ">=0" @@ -34,12 +35,14 @@ Add_dependency build libsoup-devel Add_dependency build libxslt-devel Add_dependency build icu-devel Add_dependency build enchant-devel +Add_dependency build geoclue-devel Add_dependency build gobject-introspection do_configure() { local args="--enable-video --enable-jit \ --with-font-backend=freetype --enable-introspection \ --with-unicode-backend=icu --disable-schemas-compile \ + --with-accelerated-compositing=opengl \ ${CONFIGURE_SHARED_ARGS}" for ver in 2 3; do @@ -54,7 +57,7 @@ do_build() { for ver in 2 3; do msg_normal "Building GTK+${ver} version...\n" cd ${wrksrc}/build-gtk${ver} - make ${makejobs} + make ${makejobs} || return 1 done } diff --git a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template index 14f7f8cbac2..09ba89f531b 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk-devel.template +++ b/srcpkgs/webkit-gtk3/webkit-gtk-devel.template @@ -28,14 +28,14 @@ Add_dependency run icu-devel Add_dependency run libXt-devel Add_dependency run libX11-devel Add_dependency run libXrender-devel -Add_dependency run webkit-gtk +Add_dependency run webkit-gtk ">=${version}" do_install() { vmkdir usr/lib/pkgconfig vmkdir usr/share/gir-1.0 - vmove usr/include/webkit-1.0 usr/include + vmove usr/include/webkitgtk-1.0 usr/include vmove "usr/lib/pkgconfig/*-1.0.pc" usr/lib/pkgconfig vmove "usr/share/gir-1.0/*-1.0.gir" usr/share/gir-1.0 } diff --git a/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs b/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs index 614bc909233..f367974452e 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs +++ b/srcpkgs/webkit-gtk3/webkit-gtk.rshlibs @@ -40,3 +40,10 @@ libstdc++.so.6 libm.so.6 libc.so.6 libgcc_s.so.1 +libgeoclue.so.0 +libdbus-glib-1.so.2 +libdbus-1.so.3 +libgstaudio-0.10.so.0 +libgstfft-0.10.so.0 +libGL.so.1 +libdl.so.2 diff --git a/srcpkgs/webkit-gtk3/webkit-gtk.template b/srcpkgs/webkit-gtk3/webkit-gtk.template index e8de1f17a5e..a0adfa07241 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk.template +++ b/srcpkgs/webkit-gtk3/webkit-gtk.template @@ -22,6 +22,4 @@ do_install() { usr/share/locale/$(basename $f)/LC_MESSAGES done vmove usr/share/webkitgtk-1.0 usr/share - vmove usr/share/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml \ - usr/share/glib-2.0/schemas } diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template index 6b78b43f460..34a99738461 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template +++ b/srcpkgs/webkit-gtk3/webkit-gtk3-devel.template @@ -29,10 +29,9 @@ Add_dependency run libX11-devel Add_dependency run libSM-devel Add_dependency run libICE-devel Add_dependency run libXrender-devel -Add_dependency run webkit-gtk3 +Add_dependency run webkit-gtk3 ">=${version}" -do_install() -{ +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove "usr/share/gir*" usr/share diff --git a/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs b/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs index d61299e190f..0b2ef7966d1 100644 --- a/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs +++ b/srcpkgs/webkit-gtk3/webkit-gtk3.rshlibs @@ -41,3 +41,10 @@ libXrender.so.1 libXt.so.6 libX11.so.6 libz.so.1 +libgeoclue.so.0 +libdbus-glib-1.so.2 +libdbus-1.so.3 +libgstaudio-0.10.so.0 +libgstfft-0.10.so.0 +libGL.so.1 +libdl.so.2 From 3a16531f7f1304349921baf3c4f3df28c4c1a68e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:25:57 +0200 Subject: [PATCH 02/27] epiphany: update to 3.4.0.1. --- srcpkgs/epiphany/epiphany-devel.template | 7 ++++--- srcpkgs/epiphany/epiphany.rshlibs | 2 +- srcpkgs/epiphany/template | 21 +++++++++++---------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/srcpkgs/epiphany/epiphany-devel.template b/srcpkgs/epiphany/epiphany-devel.template index 0dae3429491..28f1bd1d0fb 100644 --- a/srcpkgs/epiphany/epiphany-devel.template +++ b/srcpkgs/epiphany/epiphany-devel.template @@ -15,10 +15,11 @@ Add_dependency run libseed-devel Add_dependency run libnotify-devel Add_dependency run avahi-libs-devel Add_dependency run avahi-glib-libs-devel -Add_dependency run epiphany +Add_dependency run epiphany ">=${version}" -do_install() -{ +noarch=yes + +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/aclocal usr/share diff --git a/srcpkgs/epiphany/epiphany.rshlibs b/srcpkgs/epiphany/epiphany.rshlibs index 161f0e888d3..a37d07fcf2f 100644 --- a/srcpkgs/epiphany/epiphany.rshlibs +++ b/srcpkgs/epiphany/epiphany.rshlibs @@ -28,4 +28,4 @@ libgdk_pixbuf-2.0.so.0 libseed-gtk3.so.0 libgirepository-1.0.so.1 libgmodule-2.0.so.0 -libgthread-2.0.so.0 +libsqlite3.so.0 diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 8cbdbae784c..1463325aba8 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -1,16 +1,15 @@ # Template file for 'epiphany' pkgname=epiphany -version=3.2.1 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.4.0.1 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper ---enable-network-manager --enable-seed ---with-ca-file=/etc/ssl/certs/ca-certificates.crt --disable-tests" +--disable-tests --enable-seed" short_desc="Intuitive GNOME web browser" maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" -checksum=5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe +checksum=48acfa6efc806cc6b02f783dd92b36ba3bdf94d1e1ae02bed69886f45e400533 long_desc=" Epiphany is a simple yet powerful GNOME web browser targeted at non-technical users. Its principles are simplicity and standards compliance. Simplicity is @@ -21,13 +20,11 @@ long_desc=" by closely following the GNOME Human Interface Guidelines (HIG) and by close integration with the GNOME desktop." +shlib_depends="webkit-gtk3>=1.8.0" gtk_iconcache_dirs="/usr/share/icons/hicolor" subpackages="$pkgname-devel" -Add_dependency run ca-certificates -Add_dependency run hicolor-icon-theme -Add_dependency run desktop-file-utils - +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils @@ -35,7 +32,7 @@ Add_dependency build gobject-introspection Add_dependency build nss-devel Add_dependency build libgnome-keyring-devel Add_dependency build libsoup-gnome-devel -Add_dependency build webkit-gtk3-devel +Add_dependency build webkit-gtk3-devel ">=1.8.0" Add_dependency build startup-notification-devel Add_dependency build NetworkManager-devel Add_dependency build libseed-devel @@ -43,5 +40,9 @@ Add_dependency build libnotify-devel Add_dependency build avahi-libs-devel Add_dependency build avahi-glib-libs-devel +Add_dependency run ca-certificates +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils + Add_dependency full iso-codes Add_dependency full gsettings-desktop-schemas From 65ed733438181ebcdd72cdd5e9badb6791607c67 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:29:42 +0200 Subject: [PATCH 03/27] epiphany-extensions: update to 3.4.0. --- .../epiphany-extensions/epiphany-extensions.rshlibs | 6 ------ srcpkgs/epiphany-extensions/template | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs b/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs index 5299accf914..019d9dc76b2 100644 --- a/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs +++ b/srcpkgs/epiphany-extensions/epiphany-extensions.rshlibs @@ -5,18 +5,12 @@ libgtk-3.so.0 libsoup-2.4.so.1 libgdk-3.so.0 libatk-1.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgio-2.0.so.0 libgobject-2.0.so.0 -libgmodule-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 libglib-2.0.so.0 libjavascriptcoregtk-3.0.so.0 diff --git a/srcpkgs/epiphany-extensions/template b/srcpkgs/epiphany-extensions/template index 96fef91a5a1..cbadda9f78f 100644 --- a/srcpkgs/epiphany-extensions/template +++ b/srcpkgs/epiphany-extensions/template @@ -1,16 +1,15 @@ # Template file for 'epiphany-extensions' pkgname=epiphany-extensions -version=3.2.0 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.4.0 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper --disable-debug" -revision=2 short_desc="Extensions for Epiphany - The GNOME web browser" maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" license="GPL-2" -checksum=0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae +checksum=eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5 long_desc=" Epiphany is a simple yet powerful GNOME web browser targeted at non-technical users. Its principles are simplicity and standards compliance. Simplicity is @@ -23,13 +22,14 @@ long_desc=" This package contains some extensions for use with Epiphany." -shlib_depends="webkit-gtk3>=1.6.3" +shlib_depends="webkit-gtk3>=1.8.0" Add_dependency run epiphany +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils Add_dependency build webkit-gtk3-devel -Add_dependency build epiphany-devel +Add_dependency build epiphany-devel ">=${version}" Add_dependency build opensp-devel From de2f2dbfa8c5e1a09ca06948b890a82f8c79c775 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:30:30 +0200 Subject: [PATCH 04/27] gnome: bump to 3.4.0: reenable epiphany{,-extensions}. --- srcpkgs/gnome/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index e13c80d6e55..3d438fdba68 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,7 +1,6 @@ # Template file for 'gnome' pkgname=gnome -version=3.3.92 -revision=5 +version=3.4.0 build_style=meta-template short_desc="GNOME meta-package" maintainer="Juan RP " @@ -28,7 +27,7 @@ Add_dependency run metacity ">=2.34.3" Add_dependency run nautilus ">=${version}" Add_dependency run notification-daemon ">=0.7.4" Add_dependency run yelp ">=${version}" -#Add_dependency run epiphany ">=${version}" +Add_dependency run epiphany ">=${version}" Add_dependency run at-spi2-atk ">=2.4.0" Add_dependency run baobab ">=${version}" @@ -69,7 +68,7 @@ Add_dependency run evolution ">=${version}" Add_dependency run rygel ">=0.14.0" Add_dependency run tracker ">=0.14.0" Add_dependency run eog-plugins ">=${version}" -#Add_dependency run epiphany-extensions ">=3.2.0" +Add_dependency run epiphany-extensions ">=${version}" Add_dependency run xdg-user-dirs Add_dependency run xdg-utils From 3975b5ce5a13ca398b4fcc65193a74c2059e09ca Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 10:32:57 +0200 Subject: [PATCH 05/27] gnome-contacts: update to 3.4.0. --- srcpkgs/gnome-contacts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 344722474b8..a3a707cf0be 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,13 +1,13 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.3.92 -distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" +version=3.4.0 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure short_desc="GNOME contacts manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" -checksum=5cd65ecc9da097453987a8aeff63e0619f53a1c7e436ab9a67e4ef590fbfbe90 +checksum=06d4d8fc22d72f67296ed98d35e3ee40f26d8344bcbd14affff4a720047ccd97 long_desc=" This packages the contacts manager for the GNOME desktop." From 2f947b198d5a1559922399e9f879f39b454c4cc8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 12:12:53 +0200 Subject: [PATCH 06/27] samba: bump api_depends, forgotten in previous commit. --- srcpkgs/samba/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/samba/depends b/srcpkgs/samba/depends index 049630404b9..76829e8048c 100644 --- a/srcpkgs/samba/depends +++ b/srcpkgs/samba/depends @@ -1,2 +1,2 @@ abi_depends=">=3.5.6" -api_depends="${abi_depends}" +api_depends=">=3.6.3_1" From 33721c1ca8a80362ff6635cbc7e9635b6258b7e1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 12:16:45 +0200 Subject: [PATCH 07/27] samba-devel: revbump to require latest libsmbclient. --- srcpkgs/samba/samba-devel.template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/samba/samba-devel.template b/srcpkgs/samba/samba-devel.template index e7ca2525734..8ab9d2192f8 100644 --- a/srcpkgs/samba/samba-devel.template +++ b/srcpkgs/samba/samba-devel.template @@ -7,6 +7,7 @@ long_desc=" This package provides development files: headers, static libraries, etc." noarch=yes +revision=1 Add_dependency run libsmbclient ">=${version}" do_install() { From 38262ddd8dd4b5887db83844b8b63c669b7bfce7 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 13:04:43 +0200 Subject: [PATCH 08/27] glibmm: update to 2.31.22. --- srcpkgs/glibmm/glibmm-devel.template | 15 ++++++++------- srcpkgs/glibmm/template | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/glibmm/glibmm-devel.template b/srcpkgs/glibmm/glibmm-devel.template index 2cae00e7520..4058e0e7cb4 100644 --- a/srcpkgs/glibmm/glibmm-devel.template +++ b/srcpkgs/glibmm/glibmm-devel.template @@ -8,13 +8,14 @@ long_desc="${long_desc} Add_dependency run pkg-config Add_dependency run glib-devel Add_dependency run libsigc++-devel -Add_dependency run glibmm +Add_dependency run glibmm ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib +noarch=yes - mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/{giomm-2.4,glibmm-2.4,pkgconfig} \ - ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove usr/share usr + vmove usr/lib/giomm-2.4 usr/lib + vmove usr/lib/glibmm-2.4 usr/lib + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index b21ec0a338c..0b8cfd8ef3e 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,13 +1,13 @@ # Template build file for 'glibmm' pkgname=glibmm -version=2.31.20 +version=2.31.22 distfiles="${GNOME_SITE}/glibmm/2.31/glibmm-$version.tar.xz" build_style=gnu-configure short_desc="C++ bindings for GLib" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" license="LGPL-2.1" -checksum=09c5d915eee485fecdbc13405ca34be5c5d55e9a3923dd0acfe6982804daa34d +checksum=9941c75c8a6c89d25db5d612ac96da4ebbac0f0bbde6958fd8ea21d1e864bf4e long_desc=" glibmm (previously known as GLib--) is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks, widgets From 5d64b4e1630e79b6c19ecc1a6b271864f9f20222 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:05:01 +0200 Subject: [PATCH 09/27] gtkmm: update to 3.3.20. --- srcpkgs/gtkmm/gtkmm-devel.template | 14 ++++++++------ srcpkgs/gtkmm/template | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gtkmm/gtkmm-devel.template b/srcpkgs/gtkmm/gtkmm-devel.template index bfe44d7971e..90833d01fed 100644 --- a/srcpkgs/gtkmm/gtkmm-devel.template +++ b/srcpkgs/gtkmm/gtkmm-devel.template @@ -9,11 +9,13 @@ Add_dependency run gtk+3-devel Add_dependency run atkmm-devel Add_dependency run pangomm-devel Add_dependency run cairomm-devel -Add_dependency run gtkmm +Add_dependency run gtkmm ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/{include,share} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/{g[dt]k*,pkgconfig} ${DESTDIR}/usr/lib +noarch=yes + +do_install() { + vmove usr/include usr + vmove usr/share usr + vmove "usr/lib/g[dt]k*" usr/lib + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index aaf62f878a0..9921e0f25a7 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -1,13 +1,13 @@ # Template build file for 'gtkmm'. pkgname=gtkmm -version=3.3.18 +version=3.3.20 distfiles="${GNOME_SITE}/gtkmm/3.3/gtkmm-$version.tar.xz" build_style=gnu-configure short_desc="C++ bindings for The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" license="LGPL-2.1" -checksum=495330e2d697b04be161247003d5eb3dd45a5988dd631e789b631c5a05fb00bf +checksum=ae131bc37c158d136f61f8d01377c0ee348e3e832a22272ffa7efc530197b6b4 long_desc=" gtkmm (previously known as Gtk--) is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks, widgets @@ -23,7 +23,7 @@ subpackages="gtkmm-devel" Add_dependency build pkg-config Add_dependency build gtk+3-devel -Add_dependency build glibmm-devel ">=2.30.0" +Add_dependency build glibmm-devel ">=2.31.20" Add_dependency build atkmm-devel Add_dependency build pangomm-devel Add_dependency build cairomm-devel From 43a90cd0332dbc951df990a4e5484b4c2118e3b0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:19:19 +0200 Subject: [PATCH 10/27] expat: update to 2.1.0. --- srcpkgs/expat/expat-devel.template | 15 +++++---------- srcpkgs/expat/template | 7 ++++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/srcpkgs/expat/expat-devel.template b/srcpkgs/expat/expat-devel.template index 8a051bba3fc..faec33d290b 100644 --- a/srcpkgs/expat/expat-devel.template +++ b/srcpkgs/expat/expat-devel.template @@ -1,18 +1,13 @@ # Template file for 'expat-devel'. # -short_desc="${short_desc} (development files)" +short_desc="${short_desc} -- development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 +Add_dependency run expat ">=${version}" -Add_dependency run expat - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template index b56250afc43..4b21bc8edb6 100644 --- a/srcpkgs/expat/template +++ b/srcpkgs/expat/template @@ -1,12 +1,13 @@ # Template file for 'expat' pkgname=expat -version=2.0.1 -revision=2 +version=2.1.0 +homepage="http://expat.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/expat/$pkgname-$version.tar.gz" build_style=gnu-configure short_desc="XML parser library written in C" maintainer="Juan RP " -checksum=847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93 +license="MIT" +checksum=823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 long_desc=" This is James Clark's expat XML parser library in C. It is a stream oriented parser that requires setting handlers to deal with the From bb768808f424b42994420a65902d9525e2b16697 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:22:43 +0200 Subject: [PATCH 11/27] adobe-flash-plugin: update to 11.2.202.228. --- srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs | 3 +++ srcpkgs/adobe-flash-plugin/template | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs b/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs index 94dee570554..ef9c919f53c 100644 --- a/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs +++ b/srcpkgs/adobe-flash-plugin/adobe-flash-plugin.rshlibs @@ -28,3 +28,6 @@ libm.so.6 libc.so.6 ld-linux-x86-64.so.2 ld-linux.so.2 +libgthread-2.0.so.0 +libXcursor.so.1 +libXrender.so.1 diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 28105b22e94..9f8b56567e0 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -1,16 +1,16 @@ # Template file for 'adobe-flash-plugin' pkgname=adobe-flash-plugin -version=11.1.102.63 +version=11.2.202.228 # The EULA file _eula="http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf" _eulacksum=3cb0a5f4576be735abcff7189ed18eda17c70b762c3a78a3379b6f44395fbc10 _url=http://fpdownload.macromedia.com/get/flashplayer/pdc/${version} if [ "$XBPS_MACHINE" = "x86_64" ]; then _disttarball="${_url}/install_flash_player_11_linux.x86_64.tar.gz" - _distcksum=8e78ecf8262f318d26934a6a731cefa97b9cbd40e2312c1ab2e5b8634e600190 + _distcksum=92c9758d347d05c284dcafccbc8370d8ba9a52f039ce1dbe558be66560476681 else _disttarball="${_url}/install_flash_player_11_linux.i386.tar.gz" - _distcksum=dff9d475b3e8900e5c9a5d1d69ba766d0cdf9471217ef35c931ccefdf7b68246 + _distcksum=20a806eaf508aa8bf22d9803e94b9f942a548da87cd0a59712c7bcd1df0d44e6 fi distfiles="${_eula} ${_disttarball}" checksum="${_eulacksum} ${_distcksum}" From 571c656c6308519101c17d08379614e62183f9e9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:36:29 +0200 Subject: [PATCH 12/27] accountsservice: update to 0.6.17. --- .../accountsservice-devel.template | 15 +++++++-------- srcpkgs/accountsservice/accountsservice.rshlibs | 5 ++--- srcpkgs/accountsservice/template | 9 ++++----- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/srcpkgs/accountsservice/accountsservice-devel.template b/srcpkgs/accountsservice/accountsservice-devel.template index ee3a78810c8..49f2e8c38cd 100644 --- a/srcpkgs/accountsservice/accountsservice-devel.template +++ b/srcpkgs/accountsservice/accountsservice-devel.template @@ -5,13 +5,12 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run accountsservice +Add_dependency run accountsservice ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/{lib,share} - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/gir* ${DESTDIR}/usr/share +noarch=yes + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/gir-1.0 usr/share } diff --git a/srcpkgs/accountsservice/accountsservice.rshlibs b/srcpkgs/accountsservice/accountsservice.rshlibs index ad71449c056..8827f604ede 100644 --- a/srcpkgs/accountsservice/accountsservice.rshlibs +++ b/srcpkgs/accountsservice/accountsservice.rshlibs @@ -1,10 +1,9 @@ -libdbus-glib-1.so.2 -libdbus-1.so.3 libpthread.so.0 libpolkit-gobject-1.so.0 libgio-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libc.so.6 -librt.so.1 libcrypt.so.1 +libsystemd-login.so.0 +libsystemd-daemon.so.0 diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template index 00dd5db48b1..5e6663ba996 100644 --- a/srcpkgs/accountsservice/template +++ b/srcpkgs/accountsservice/template @@ -1,15 +1,14 @@ # Template file for 'accountsservice' pkgname=accountsservice -version=0.6.15 -revision=5 +version=0.6.17 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--with-systemdsystemunitdir=/lib/systemd/system" +configure_args="--disable-static --with-systemdsystemunitdir=/lib/systemd/system" short_desc="D-Bus interfaces for querying and manipulating user account information" maintainer="Juan RP " homepage="http://cgit.freedesktop.org/accountsservice/" license="GPL-3" -checksum=9feb3d58c5c739f2df4b5410404b29f16e3f4aa6739b685ceb12903f4d5ea867 +checksum=2f230e421f0d793e4b3e37874399010251ba63362e2723f42c1689560f29f7f3 long_desc=" The accountsservice project provides a set of D-Bus interfaces for querying and manipulating user account information and an implementation @@ -21,8 +20,8 @@ subpackages="$pkgname-devel" Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gobject-introspection -Add_dependency build dbus-glib-devel Add_dependency build polkit-devel +Add_dependency build systemd-devel Add_dependency run ConsoleKit-x11 # uses ConsoleKit dbus stuff. From dfabd8fe05dbccaff4c73f63241e050149c89fbd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:45:39 +0200 Subject: [PATCH 13/27] gnome-media: update to 3.4.0. --- srcpkgs/gnome-media/template | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-media/template b/srcpkgs/gnome-media/template index 47824cadd39..992a8139495 100644 --- a/srcpkgs/gnome-media/template +++ b/srcpkgs/gnome-media/template @@ -1,19 +1,23 @@ # Template file for 'gnome-media' pkgname=gnome-media -version=2.91.2 -distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2" +version=3.4.0 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure -revision=1 +configure_args="--disable-schemas-install +--with-gconf-schema-file-dir=/usr/share/gconf/schemas" short_desc="GNOME Media Tools" maintainer="davehome " homepage="http://www.gnome.org" license="GPL-2" -checksum=4aadc834d04c3d6f573fad667a69c6dc9668240e759cbd8cfb14d053d8e4da5f +checksum=a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f long_desc=" The GNOME Media package contains GNOME's media applications." +gconf_schemas="gnome-sound-recorder.schemas" + Add_dependency run desktop-file-utils +Add_dependency build which Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils @@ -21,3 +25,9 @@ Add_dependency build GConf-devel Add_dependency build gtk+3-devel Add_dependency build libgnome-media-profiles-devel Add_dependency build gst-plugins-base-devel + +post_install() { + mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} + gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ + --domain gnome-media ${wrksrc}/*.schemas +} From df4c32a560cf95fd03f986ac310219f2d1db4850 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:46:20 +0200 Subject: [PATCH 14/27] gnome: added gnome-media. --- srcpkgs/gnome/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 3d438fdba68..7ead5a276dd 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -1,6 +1,7 @@ # Template file for 'gnome' pkgname=gnome version=3.4.0 +revision=1 build_style=meta-template short_desc="GNOME meta-package" maintainer="Juan RP " @@ -44,6 +45,7 @@ Add_dependency run gnome-system-monitor ">=${version}" Add_dependency run gnome-bluetooth ">=${version}" Add_dependency run gnome-color-manager ">=${version}" Add_dependency run gnome-keyring ">=${version}" +Add_dependency run gnome-media ">=${version}" Add_dependency run eog ">=${version}" Add_dependency run gedit ">=${version}" Add_dependency run gdm ">=${version}" From e35db5d4c35183343498d392eda38eebe3d27186 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:49:49 +0200 Subject: [PATCH 15/27] gnome-media: update icon caches. --- srcpkgs/gnome-media/template | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-media/template b/srcpkgs/gnome-media/template index 992a8139495..462d9e363e9 100644 --- a/srcpkgs/gnome-media/template +++ b/srcpkgs/gnome-media/template @@ -1,6 +1,7 @@ # Template file for 'gnome-media' pkgname=gnome-media version=3.4.0 +revision=1 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-install @@ -14,8 +15,7 @@ long_desc=" The GNOME Media package contains GNOME's media applications." gconf_schemas="gnome-sound-recorder.schemas" - -Add_dependency run desktop-file-utils +gtk_iconcache_dirs="/usr/share/icons/hicolor" Add_dependency build which Add_dependency build pkg-config @@ -26,6 +26,9 @@ Add_dependency build gtk+3-devel Add_dependency build libgnome-media-profiles-devel Add_dependency build gst-plugins-base-devel +Add_dependency run hicolor-icon-theme +Add_dependency run desktop-file-utils + post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \ From b6ef99c46e73ce3ea7aa11ed6b9cd4f6f33203c4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 14:58:02 +0200 Subject: [PATCH 16/27] dhcpcd: update to 5.5.6. --- srcpkgs/dhcpcd/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index e68336c1f70..4a89f577111 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,6 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=5.5.4 -revision=1 +version=5.5.6 homepage="http://roy.marples.name/projects/dhcpcd" distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2" build_style=configure @@ -9,7 +8,7 @@ configure_args="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --rundir=/ short_desc="RFC2131 compliant DHCP client" maintainer="Juan RP " license="Simplified BSD" -checksum=a6827dc8319b979d8ba865ef84b9c0cdc453b133ae60783a4d622ea313aa17fe +checksum=657f10dc7de48cba9f7170b593bf0e11987d06bd12378e3f4cd01b9e99b1e8e7 long_desc=" dhcpcd is a RFC 2131 compliant DHCP client. It's also a RFC 3927 compliant IPv4LL (aka ZeroConf) client. From 656253e47be8d12f62a04ea738f33a9091e831dc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 15:06:12 +0200 Subject: [PATCH 17/27] libldap: update to 2.4.30. --- srcpkgs/libldap/libldap-devel.template | 12 +++++------- srcpkgs/libldap/template | 16 +++++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/srcpkgs/libldap/libldap-devel.template b/srcpkgs/libldap/libldap-devel.template index ee130ab3537..c2c8e0a12f8 100644 --- a/srcpkgs/libldap/libldap-devel.template +++ b/srcpkgs/libldap/libldap-devel.template @@ -7,12 +7,10 @@ long_desc="${long_desc} Add_dependency run openssl-devel Add_dependency run libsasl-devel -Add_dependency run libldap +Add_dependency run libldap ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/share/man/man3 usr/share/man } diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template index eb47968a87c..f47f215d113 100644 --- a/srcpkgs/libldap/template +++ b/srcpkgs/libldap/template @@ -1,16 +1,17 @@ # Template file for 'libldap' pkgname=libldap -version=2.4.24 +version=2.4.30 wrksrc="openldap-${version}" +homepage="http://www.openldap.org" distfiles="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-$version.tgz" build_style=gnu-configure -configure_args="--enable-dynamic --enable-proctitle ---enable-ipv6 --enable-local --with-cyrus-sasl --with-threads --with-tls +configure_args="--enable-dynamic --enable-proctitle --with-tls +--enable-ipv6 --enable-local --with-cyrus-sasl --with-threads --enable-syslog --disable-slapd" -revision=1 short_desc="OpenLDAP libraries" +license="OpenLDAP License v2.8 -- BSD alike" maintainer="Juan RP " -checksum=fdcecb64082a0d8e124f13b31fccf4765901e29decaf4224b28d4cff90a14614 +checksum=fc013e528616f8578d9f221409c48af9b8937a62005e0bec88f6f1c4c8ff3d81 long_desc=" These are the run-time libraries for the OpenLDAP (Lightweight Directory Access Protocol) servers and clients." @@ -23,8 +24,7 @@ Add_dependency build libsasl-devel Add_dependency build openssl-devel Add_dependency build groff -post_install() -{ +post_install() { # Remove unused stuff. rm -rf ${DESTDIR}/usr/bin rm -rf ${DESTDIR}/usr/share/man/man[18] @@ -32,4 +32,6 @@ post_install() mv ${DESTDIR}/usr/share/man/man5/ldap.conf.5 ${DESTDIR}/usr/share/man rm -f ${DESTDIR}/usr/share/man/man5/* mv ${DESTDIR}/usr/share/man/ldap.conf.5 ${DESTDIR}/usr/share/man/man5 + # License + vinstall LICENSE 644 usr/share/licenses/$pkgname } From 6897626094c622fe35a6dbfa9f5bd4a258a58f68 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 15:47:35 +0200 Subject: [PATCH 18/27] gnome-desktop: add missing SONAMEs, increase api_depends. --- srcpkgs/gnome-desktop/depends | 2 +- srcpkgs/gnome-desktop/gnome-desktop.rshlibs | 2 ++ srcpkgs/gnome-desktop/template | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnome-desktop/depends b/srcpkgs/gnome-desktop/depends index 6e8d7e9a547..e7e77019f36 100644 --- a/srcpkgs/gnome-desktop/depends +++ b/srcpkgs/gnome-desktop/depends @@ -1,2 +1,2 @@ abi_depends=">=2.91.90" -api_depends="${abi_depends}" +api_depends=">=3.4.0" diff --git a/srcpkgs/gnome-desktop/gnome-desktop.rshlibs b/srcpkgs/gnome-desktop/gnome-desktop.rshlibs index e5554bcca14..b7772810a76 100644 --- a/srcpkgs/gnome-desktop/gnome-desktop.rshlibs +++ b/srcpkgs/gnome-desktop/gnome-desktop.rshlibs @@ -15,3 +15,5 @@ libglib-2.0.so.0 libXrandr.so.2 libXext.so.6 libc.so.6 +libgmodule-2.0.so.0 +libpthread.so.0 diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index a2fb89a4b97..9f721e45b21 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,6 +1,7 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop version=3.4.0 +revision=1 homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure From 434d6a0fd1561cc1c5be4555d1707b1c5e9e63f2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 15:55:47 +0200 Subject: [PATCH 19/27] gnome-menus: bump api_depends. --- srcpkgs/gnome-menus/depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-menus/depends b/srcpkgs/gnome-menus/depends index 0edbddbd1a9..c365da46a7a 100644 --- a/srcpkgs/gnome-menus/depends +++ b/srcpkgs/gnome-menus/depends @@ -1,2 +1,2 @@ abi_depends=">=2.91.6" -api_depends="${abi_depends}" +api_depends=">=3.4.0" From 8f59562e2fe15d1dd3b3d676dbab1a1918b77055 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 16:06:54 +0200 Subject: [PATCH 20/27] libgnomekbd: add missing SONAMEs, increase api_depends. --- srcpkgs/libgnomekbd/depends | 2 +- srcpkgs/libgnomekbd/libgnomekbd.rshlibs | 2 ++ srcpkgs/libgnomekbd/template | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libgnomekbd/depends b/srcpkgs/libgnomekbd/depends index 6e8d7e9a547..e7e77019f36 100644 --- a/srcpkgs/libgnomekbd/depends +++ b/srcpkgs/libgnomekbd/depends @@ -1,2 +1,2 @@ abi_depends=">=2.91.90" -api_depends="${abi_depends}" +api_depends=">=3.4.0" diff --git a/srcpkgs/libgnomekbd/libgnomekbd.rshlibs b/srcpkgs/libgnomekbd/libgnomekbd.rshlibs index 77ce26d56e1..4a28ec0d708 100644 --- a/srcpkgs/libgnomekbd/libgnomekbd.rshlibs +++ b/srcpkgs/libgnomekbd/libgnomekbd.rshlibs @@ -14,3 +14,5 @@ libc.so.6 libgtk-3.so.0 libatk-1.0.so.0 libm.so.6 +libgmodule-2.0.so.0 +librt.so.1 diff --git a/srcpkgs/libgnomekbd/template b/srcpkgs/libgnomekbd/template index e9394c92e4c..d2d059150fb 100644 --- a/srcpkgs/libgnomekbd/template +++ b/srcpkgs/libgnomekbd/template @@ -1,6 +1,7 @@ # Template file for 'libgnomekbd' pkgname=libgnomekbd version=3.4.0.2 +revision=1 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-static" From 4d7a771a54017f68e88fb438eebf54b1cec3f079 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 16:11:18 +0200 Subject: [PATCH 21/27] gnome-screensaver: reenable systemd support, it works now. --- srcpkgs/gnome-screensaver/gnome-screensaver.rshlibs | 2 ++ srcpkgs/gnome-screensaver/template | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-screensaver/gnome-screensaver.rshlibs b/srcpkgs/gnome-screensaver/gnome-screensaver.rshlibs index c0d34f0ea27..058060587f4 100644 --- a/srcpkgs/gnome-screensaver/gnome-screensaver.rshlibs +++ b/srcpkgs/gnome-screensaver/gnome-screensaver.rshlibs @@ -17,3 +17,5 @@ libpam.so.0 libgnomekbdui.so.7 libgdk_pixbuf-2.0.so.0 libxklavier.so.16 +libsystemd-login.so.0 +libsystemd-daemon.so.0 diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template index f4efd670e42..55a72d28547 100644 --- a/srcpkgs/gnome-screensaver/template +++ b/srcpkgs/gnome-screensaver/template @@ -1,10 +1,11 @@ # Template file for 'gnome-screensaver' pkgname=gnome-screensaver version=3.4.0 +revision=1 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--with-mit-ext --disable-maintainer-mode --without-systemd ---with-console-kit" +configure_args="--with-mit-ext --disable-maintainer-mode --with-systemd +--without-console-kit" short_desc="GNOME screen saver and locker" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeScreensaver" @@ -32,6 +33,7 @@ Add_dependency build libXScrnSaver-devel Add_dependency build libXxf86misc-devel Add_dependency build libgnomekbd-devel Add_dependency build gnome-desktop-devel +Add_dependency build systemd-devel Add_dependency full gsettings-desktop-schemas From caad6b4dd8970a7629b5413985567cb4565ce7c5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 18:09:54 +0200 Subject: [PATCH 22/27] librsvg: add missing SONAMEs, increase api_depends. --- srcpkgs/librsvg/depends | 2 +- srcpkgs/librsvg/librsvg.rshlibs | 2 ++ srcpkgs/librsvg/template | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/librsvg/depends b/srcpkgs/librsvg/depends index 548bf7b4636..747196740a0 100644 --- a/srcpkgs/librsvg/depends +++ b/srcpkgs/librsvg/depends @@ -1,2 +1,2 @@ abi_depends=">=2.26.0" -api_depends=">=2.34.2_2" +api_depends=">=2.36.0" diff --git a/srcpkgs/librsvg/librsvg.rshlibs b/srcpkgs/librsvg/librsvg.rshlibs index 71a6aa61586..ff51a4ee3a1 100644 --- a/srcpkgs/librsvg/librsvg.rshlibs +++ b/srcpkgs/librsvg/librsvg.rshlibs @@ -19,3 +19,5 @@ libcroco-0.6.so.3 libxml2.so.2 libm.so.6 libatk-1.0.so.0 +libgmodule-2.0.so.0 +librt.so.1 diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index 1e091fe9edb..04226413a37 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -1,6 +1,7 @@ # Template build file for 'librsvg'. pkgname=librsvg version=2.36.0 +revision=1 distfiles="${GNOME_SITE}/$pkgname/2.36/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-static --enable-introspection" From 4e6d099e10ae55c2c741c13d975df4f085217e69 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 18:10:13 +0200 Subject: [PATCH 23/27] libpeas: update to 1.4.0. --- srcpkgs/libpeas/depends | 2 +- srcpkgs/libpeas/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libpeas/depends b/srcpkgs/libpeas/depends index a66f7dfdeb8..535a13f1266 100644 --- a/srcpkgs/libpeas/depends +++ b/srcpkgs/libpeas/depends @@ -1,2 +1,2 @@ abi_depends=">=1.0.0" -api_depends="${abi_depends}" +api_depends=">=1.4.0" diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template index 27e30b142aa..58ff6147477 100644 --- a/srcpkgs/libpeas/template +++ b/srcpkgs/libpeas/template @@ -1,12 +1,12 @@ # Template file for 'libpeas' pkgname=libpeas -version=1.3.0 -distfiles="${GNOME_SITE}/$pkgname/1.3/$pkgname-$version.tar.xz" +version=1.4.0 +distfiles="${GNOME_SITE}/$pkgname/1.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--enable-vala" short_desc="Gobject-based plugins engine" maintainer="Juan RP " -checksum=aefff05cdd39d7a88986af54f2980034857482605e777ce5345ba3b5653fe79d +checksum=d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6 long_desc=" libpeas is a gobject-based plugins engine, and is targetted at giving every application the chance to assume its own extensibility. It is currently used by From a431505114534ef8d3495bc137fa151f38e96196 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 18:10:25 +0200 Subject: [PATCH 24/27] gnome-icon-theme: update to 3.4.0. --- srcpkgs/gnome-icon-theme/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-icon-theme/template b/srcpkgs/gnome-icon-theme/template index 2505b02c7d9..a01efea2f38 100644 --- a/srcpkgs/gnome-icon-theme/template +++ b/srcpkgs/gnome-icon-theme/template @@ -1,12 +1,12 @@ # Template build file for 'gnome-icon-theme'. pkgname=gnome-icon-theme -version=3.3.91 -distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" +version=3.4.0 +distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--enable-icon-mapping" short_desc="Theme consisting of a set of icons for GNOME" maintainer="Juan RP " -checksum=3c9956f296b614aa137e03d0dcb6d84ca727297b81eb73c5f9a5d3f91aba4fdc +checksum=0963524f488f48e8b982ca80c1b5207c4e0946ccb95c131b853c9ff448f8e159 long_desc=" This package contains a set of icons forming the default icon theme for GNOME." From f6a34f3b2f6aab3251d77b60b9939f446d83e994 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 18:10:52 +0200 Subject: [PATCH 25/27] gnome-online-accounts: add missing SONAMEs, increase api_depends. --- srcpkgs/gnome-online-accounts/depends | 2 +- srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs | 2 ++ srcpkgs/gnome-online-accounts/template | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnome-online-accounts/depends b/srcpkgs/gnome-online-accounts/depends index d6ddca4b412..13d341d243e 100644 --- a/srcpkgs/gnome-online-accounts/depends +++ b/srcpkgs/gnome-online-accounts/depends @@ -1,2 +1,2 @@ abi_depends=">=3.2.0" -api_depends="${abi_depends}" +api_depends=">=3.4.0" diff --git a/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs b/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs index 09272c9fd2b..ee966752686 100644 --- a/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs +++ b/srcpkgs/gnome-online-accounts/gnome-online-accounts.rshlibs @@ -20,3 +20,5 @@ libsoup-gnome-2.4.so.1 libsoup-2.4.so.1 libnotify.so.4 libjavascriptcoregtk-3.0.so.0 +libgmodule-2.0.so.0 +librt.so.1 diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index c77ee5cf42a..fbeb6832109 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -1,6 +1,7 @@ # Template file for 'gnome-online-accounts' pkgname=gnome-online-accounts version=3.4.0 +revision=1 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--enable-google --enable-twitter From fbed698f299d2885cdd81d8769502081d7f03796 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 18:13:58 +0200 Subject: [PATCH 26/27] gdm: enable pam_systemd.so support. --- srcpkgs/gdm/files/gdm-autologin.pam | 2 ++ srcpkgs/gdm/files/gdm-fingerprint.pam | 2 ++ srcpkgs/gdm/files/gdm-password.pam | 1 + srcpkgs/gdm/files/gdm-smartcard.pam | 2 ++ srcpkgs/gdm/files/gdm-welcome.pam | 3 ++- srcpkgs/gdm/files/gdm.pam | 1 + srcpkgs/gdm/template | 1 + 7 files changed, 11 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gdm/files/gdm-autologin.pam b/srcpkgs/gdm/files/gdm-autologin.pam index b8de5ddd6af..ba621cfd960 100644 --- a/srcpkgs/gdm/files/gdm-autologin.pam +++ b/srcpkgs/gdm/files/gdm-autologin.pam @@ -13,5 +13,7 @@ password required pam_deny.so session required pam_loginuid.so session optional pam_keyinit.so revoke +session optional pam_gnome_keyring.so +session optional pam_systemd.so session required pam_unix.so session required pam_limits.so diff --git a/srcpkgs/gdm/files/gdm-fingerprint.pam b/srcpkgs/gdm/files/gdm-fingerprint.pam index a58f3250070..ac8be3eee63 100644 --- a/srcpkgs/gdm/files/gdm-fingerprint.pam +++ b/srcpkgs/gdm/files/gdm-fingerprint.pam @@ -13,5 +13,7 @@ password required pam_deny.so session required pam_loginuid.so session optional pam_keyinit.so revoke +session optional pam_gnome_keyring.so +session optional pam_systemd.so session required pam_unix.so session required pam_limits.so diff --git a/srcpkgs/gdm/files/gdm-password.pam b/srcpkgs/gdm/files/gdm-password.pam index b10b366ac93..00e5d3c9870 100644 --- a/srcpkgs/gdm/files/gdm-password.pam +++ b/srcpkgs/gdm/files/gdm-password.pam @@ -17,3 +17,4 @@ session optional pam_keyinit.so revoke session required pam_unix.so session required pam_limits.so session optional pam_gnome_keyring.so auto_start +session optional pam_systemd.so diff --git a/srcpkgs/gdm/files/gdm-smartcard.pam b/srcpkgs/gdm/files/gdm-smartcard.pam index e7b82b72cd3..dec63a4660e 100644 --- a/srcpkgs/gdm/files/gdm-smartcard.pam +++ b/srcpkgs/gdm/files/gdm-smartcard.pam @@ -13,5 +13,7 @@ password required pam_pkcs11.so session required pam_loginuid.so session optional pam_keyinit.so revoke +session optional pam_gnome_keyring.so +session optional pam_systemd.so session required pam_unix.so session required pam_limits.so diff --git a/srcpkgs/gdm/files/gdm-welcome.pam b/srcpkgs/gdm/files/gdm-welcome.pam index e6d585a93e9..d8a03845c78 100644 --- a/srcpkgs/gdm/files/gdm-welcome.pam +++ b/srcpkgs/gdm/files/gdm-welcome.pam @@ -8,5 +8,6 @@ account required pam_unix.so password required pam_deny.so session required pam_loginuid.so --session optional pam_systemd.so +session optional pam_gnome_keyring.so +session optional pam_systemd.so session optional pam_keyinit.so force revoke diff --git a/srcpkgs/gdm/files/gdm.pam b/srcpkgs/gdm/files/gdm.pam index dbbdebd8163..37a72c0e336 100644 --- a/srcpkgs/gdm/files/gdm.pam +++ b/srcpkgs/gdm/files/gdm.pam @@ -6,5 +6,6 @@ auth optional pam_gnome_keyring.so account required pam_unix.so session required pam_unix.so session optional pam_gnome_keyring.so auto_start +session optional pam_systemd.so session required pam_limits.so password required pam_unix.so diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 6a23eedddb6..cd2a59f91ec 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,6 +1,7 @@ # Template file for 'gdm' pkgname=gdm version=3.4.0.1 +revision=1 distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper From 5aa2c55b21b7c373ba7ac005e6a954ae5d7ae42c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 28 Mar 2012 18:18:32 +0200 Subject: [PATCH 27/27] gdm: readd missing SONAME. --- srcpkgs/gdm/gdm.rshlibs | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/gdm/gdm.rshlibs b/srcpkgs/gdm/gdm.rshlibs index a78a33cd95a..a7e9cb41980 100644 --- a/srcpkgs/gdm/gdm.rshlibs +++ b/srcpkgs/gdm/gdm.rshlibs @@ -29,3 +29,4 @@ librt.so.1 libfontconfig.so.1 libcanberra-gtk3.so.0 libcanberra.so.0 +libgmodule-2.0.so.0