diff options
Diffstat (limited to 'community/gnome-settings-daemon-updates')
| -rw-r--r-- | community/gnome-settings-daemon-updates/PKGBUILD | 21 | ||||
| -rw-r--r-- | community/gnome-settings-daemon-updates/arch.patch | 11 | ||||
| -rw-r--r-- | community/gnome-settings-daemon-updates/packagekit-0.8.patch | 60 |
3 files changed, 85 insertions, 7 deletions
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 9deab5537..2f42c8398 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 99775 2013-10-30 23:38:21Z allan $ +# $Id: PKGBUILD 102872 2013-12-23 06:37:43Z bgyorgy $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.8.2 +pkgver=3.10.2 pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') @@ -14,15 +14,21 @@ options=('!emptydirs') install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" + 'packagekit-0.8.patch' 'arch.patch') -sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be' - '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') +sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264' + '2fd5ee457f5d57bfd9edef049719f55ab1cab5fe6d0fb422f91fe363c02e6efd' + '217004c112b18cf136c535ef3d6cc90f0cecc495573cfb8653ff089230d248bb') -build() { +prepare() { cd "$srcdir/$_pkgname-$pkgver" - + patch -RNp1 -i "$srcdir/packagekit-0.8.patch" patch -Np1 -i "$srcdir/arch.patch" +} +build() { + cd "$srcdir/$_pkgname-$pkgver" + autoreconf -fi ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -31,7 +37,8 @@ build() { #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -s + make -C 'gnome-settings-daemon' + make -C 'plugins/updates' } package() { diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch index df70cd9f8..297b98a48 100644 --- a/community/gnome-settings-daemon-updates/arch.patch +++ b/community/gnome-settings-daemon-updates/arch.patch @@ -35,6 +35,17 @@ index 81c7179..6fd3534 100644 libupdates_la_CPPFLAGS = \ -I$(top_srcdir)/gnome-settings-daemon \ +@@ -58,7 +60,9 @@ gsd_test_updates_SOURCES = \ + gsd-updates-firmware.h \ + gsd-updates-firmware.c \ + gsd-updates-manager.h \ +- gsd-updates-manager.c ++ gsd-updates-manager.c \ ++ gsd-updates-watch.h \ ++ gsd-updates-watch.c + + gsd_test_updates_CPPFLAGS = \ + -I$(top_srcdir)/data/ \ diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c index 95ee1c4..7b26c06 100644 --- a/plugins/updates/gsd-updates-manager.c diff --git a/community/gnome-settings-daemon-updates/packagekit-0.8.patch b/community/gnome-settings-daemon-updates/packagekit-0.8.patch new file mode 100644 index 000000000..eae0105e0 --- /dev/null +++ b/community/gnome-settings-daemon-updates/packagekit-0.8.patch @@ -0,0 +1,60 @@ +From 5f4f1ed45747343f26f280401bc4915d92b71d89 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Mon, 30 Sep 2013 12:06:22 +0000 +Subject: updates: Raise the dep on PackageKit to avoid complexity + +--- +diff --git a/configure.ac b/configure.ac +index 87eb473..199542c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -306,7 +306,7 @@ AC_ARG_ENABLE(packagekit, + [WANT_PACKAGEKIT=yes]) dnl Default value + + if test x$WANT_PACKAGEKIT = xyes ; then +- PK_REQUIRED_VERSION=0.7.4 ++ PK_REQUIRED_VERSION=0.8.1 + PKG_CHECK_MODULES(PACKAGEKIT, glib-2.0 packagekit-glib2 >= $PK_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION gudev-1.0 libnotify >= $LIBNOTIFY_REQUIRED_VERSION, + [have_packagekit=true + AC_DEFINE(HAVE_PACKAGEKIT, 1, [Define if PackageKit should be used])], +diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c +index 3aff29a..0f73a42 100644 +--- a/plugins/updates/gsd-updates-manager.c ++++ b/plugins/updates/gsd-updates-manager.c +@@ -742,7 +742,6 @@ auto_download_updates (GsdUpdatesManager *manager) + package_ids[i] = g_strdup (pk_package_get_id (pkg)); + } + +-#if PK_CHECK_VERSION(0,8,1) + /* we've set only-download in PkTask */ + pk_task_update_packages_async (manager->priv->task, + package_ids, +@@ -750,16 +749,6 @@ auto_download_updates (GsdUpdatesManager *manager) + NULL, NULL, + (GAsyncReadyCallback) package_download_finished_cb, + manager); +-#else +- /* download them all */ +- pk_client_download_packages_async (PK_CLIENT(manager->priv->task), +- package_ids, +- NULL, /* this means system cache */ +- manager->priv->cancellable, +- NULL, NULL, +- (GAsyncReadyCallback) package_download_finished_cb, +- manager); +-#endif + g_strfreev (package_ids); + } + +@@ -1506,9 +1495,7 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, + g_object_set (manager->priv->task, + "background", TRUE, + "interactive", FALSE, +-#if PK_CHECK_VERSION(0,8,1) + "only-download", TRUE, +-#endif + NULL); + + /* watch UDev for missing firmware */ +-- +cgit v0.9.2 |