[arch-commits] Commit in gnome-control-center/repos (14 files)
Jan Steffens
heftig at archlinux.org
Wed Oct 28 22:49:11 UTC 2015
Date: Wednesday, October 28, 2015 @ 23:49:11
Author: heftig
Revision: 249845
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnome-control-center/repos/extra-i686/0001-Add-systemd-user-services.patch
(from rev 249844, gnome-control-center/trunk/0001-Add-systemd-user-services.patch)
gnome-control-center/repos/extra-i686/PKGBUILD
(from rev 249844, gnome-control-center/trunk/PKGBUILD)
gnome-control-center/repos/extra-i686/gnome-control-center.install
(from rev 249844, gnome-control-center/trunk/gnome-control-center.install)
gnome-control-center/repos/extra-i686/sharing.patch
(from rev 249844, gnome-control-center/trunk/sharing.patch)
gnome-control-center/repos/extra-x86_64/0001-Add-systemd-user-services.patch
(from rev 249844, gnome-control-center/trunk/0001-Add-systemd-user-services.patch)
gnome-control-center/repos/extra-x86_64/PKGBUILD
(from rev 249844, gnome-control-center/trunk/PKGBUILD)
gnome-control-center/repos/extra-x86_64/gnome-control-center.install
(from rev 249844, gnome-control-center/trunk/gnome-control-center.install)
gnome-control-center/repos/extra-x86_64/sharing.patch
(from rev 249844, gnome-control-center/trunk/sharing.patch)
Deleted:
gnome-control-center/repos/extra-i686/PKGBUILD
gnome-control-center/repos/extra-i686/gnome-control-center.install
gnome-control-center/repos/extra-i686/sharing.patch
gnome-control-center/repos/extra-x86_64/PKGBUILD
gnome-control-center/repos/extra-x86_64/gnome-control-center.install
gnome-control-center/repos/extra-x86_64/sharing.patch
---------------------------------------------------+
/PKGBUILD | 116 ++++++++++++++++
/gnome-control-center.install | 22 +++
/sharing.patch | 84 +++++++++++
extra-i686/0001-Add-systemd-user-services.patch | 144 ++++++++++++++++++++
extra-i686/PKGBUILD | 57 -------
extra-i686/gnome-control-center.install | 11 -
extra-i686/sharing.patch | 42 -----
extra-x86_64/0001-Add-systemd-user-services.patch | 144 ++++++++++++++++++++
extra-x86_64/PKGBUILD | 57 -------
extra-x86_64/gnome-control-center.install | 11 -
extra-x86_64/sharing.patch | 42 -----
11 files changed, 510 insertions(+), 220 deletions(-)
Copied: gnome-control-center/repos/extra-i686/0001-Add-systemd-user-services.patch (from rev 249844, gnome-control-center/trunk/0001-Add-systemd-user-services.patch)
===================================================================
--- extra-i686/0001-Add-systemd-user-services.patch (rev 0)
+++ extra-i686/0001-Add-systemd-user-services.patch 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,144 @@
+From 2f8c902f4b9f86c8e3a6be758d78908e8cb50d0d Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 28 Oct 2015 23:27:19 +0100
+Subject: [PATCH] Add systemd user services
+
+Follows the code in GVFS.
+---
+ search-provider/Makefile.am | 16 ++++++++++-----
+ ...gnome-control-center-search-provider.service.in | 7 +++++++
+ ...g.gnome.ControlCenter.SearchProvider.service.in | 3 ++-
+ shell/Makefile.am | 24 ++++++++++++++--------
+ shell/gnome-control-center.service.in | 7 +++++++
+ shell/org.gnome.ControlCenter.service.in | 1 +
+ 6 files changed, 44 insertions(+), 14 deletions(-)
+ create mode 100644 search-provider/gnome-control-center-search-provider.service.in
+ create mode 100644 shell/gnome-control-center.service.in
+
+diff --git a/search-provider/Makefile.am b/search-provider/Makefile.am
+index 2314d66..864d895 100644
+--- a/search-provider/Makefile.am
++++ b/search-provider/Makefile.am
+@@ -38,17 +38,23 @@ gnome_control_center_search_provider_LDADD = \
+ $(top_builddir)/shell/libshell.la \
+ $(SHELL_LIBS)
+
+-CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
++CLEANFILES = $(BUILT_SOURCES) $(service_DATA) $(systemd_user_DATA)
+
+ servicedir = $(datadir)/dbus-1/services
+ service_DATA = $(service_in_files:.service.in=.service)
+-service_in_files = \
+- org.gnome.ControlCenter.SearchProvider.service.in
++service_in_files = org.gnome.ControlCenter.SearchProvider.service.in
+
+-org.gnome.ControlCenter.SearchProvider.service: org.gnome.ControlCenter.SearchProvider.service.in Makefile
++systemd_userdir = ${prefix}/lib/systemd/user
++systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
++systemd_user_in_files = gnome-control-center-search-provider.service.in
++
++$(service_DATA): $(service_in_files) Makefile
+ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+-EXTRA_DIST = $(service_in_files) org.gnome.ShellSearchProvider2.xml
++$(systemd_user_DATA): $(systemd_user_in_files) Makefile
++ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++
++EXTRA_DIST = $(service_in_files) $(systemd_user_in_files) org.gnome.ShellSearchProvider2.xml
+
+ searchproviderdir = $(datadir)/gnome-shell/search-providers
+ dist_searchprovider_DATA = gnome-control-center-search-provider.ini
+diff --git a/search-provider/gnome-control-center-search-provider.service.in b/search-provider/gnome-control-center-search-provider.service.in
+new file mode 100644
+index 0000000..4e56af1
+--- /dev/null
++++ b/search-provider/gnome-control-center-search-provider.service.in
+@@ -0,0 +1,7 @@
++[Unit]
++Description=GNOME Control Center Search Provider
++
++[Service]
++Type=dbus
++BusName=org.gnome.ControlCenter.SearchProvider
++ExecStart=@libexecdir@/gnome-control-center-search-provider
+diff --git a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in b/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
+index 81dd0c8..79b54a2 100644
+--- a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
++++ b/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.gnome.ControlCenter.SearchProvider
+-Exec=@libexecdir@/gnome-control-center-search-provider
+\ No newline at end of file
++Exec=@libexecdir@/gnome-control-center-search-provider
++SystemdService=gnome-control-center-search-provider.service
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index f72ebe9..bf78fd3 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -91,12 +91,19 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
+-# Dbus service file
+-servicefiledir = $(datadir)/dbus-1/services
+-servicefile_in_files = org.gnome.ControlCenter.service.in
+-servicefile_DATA = $(servicefile_in_files:.service.in=.service)
+-$(servicefile_DATA): $(servicefile_in_files) Makefile
+- $(AM_V_GEN) sed -e 's|[@]bindir[@]|$(bindir)|' $< > $@
++servicedir = $(datadir)/dbus-1/services
++service_DATA = $(service_in_files:.service.in=.service)
++service_in_files = org.gnome.ControlCenter.service.in
++
++systemd_userdir = ${prefix}/lib/systemd/user
++systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
++systemd_user_in_files = gnome-control-center.service.in
++
++$(service_DATA): $(service_in_files) Makefile
++ $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
++
++$(systemd_user_DATA): $(systemd_user_in_files) Makefile
++ $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+ sysdir = $(datadir)/applications
+ sys_in_files = gnome-control-center.desktop.in
+@@ -111,11 +118,12 @@ completions/gnome-control-center: completions/gnome-control-center.in list-panel
+
+ EXTRA_DIST = \
+ gnome-control-center.desktop.in.in \
+- $(servicefile_in_files) \
++ $(service_in_files) \
++ $(systemd_user_in_files) \
+ $(completion_in_files) \
+ list-panel.sh
+
+-CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA)
++CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(service_DATA) $(systemd_user_DATA)
+ DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in
+
+ noinst_PROGRAMS = test-hostname
+diff --git a/shell/gnome-control-center.service.in b/shell/gnome-control-center.service.in
+new file mode 100644
+index 0000000..bd80ee0
+--- /dev/null
++++ b/shell/gnome-control-center.service.in
+@@ -0,0 +1,7 @@
++[Unit]
++Description=GNOME Control Center
++
++[Service]
++Type=dbus
++BusName=org.gnome.ControlCenter
++ExecStart=@bindir@/gnome-control-center
+diff --git a/shell/org.gnome.ControlCenter.service.in b/shell/org.gnome.ControlCenter.service.in
+index a515129..1f2489d 100644
+--- a/shell/org.gnome.ControlCenter.service.in
++++ b/shell/org.gnome.ControlCenter.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.gnome.ControlCenter
+ Exec=@bindir@/gnome-control-center
++SystemdService=gnome-control-center.service
+--
+2.6.1
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-10-28 22:45:23 UTC (rev 249844)
+++ extra-i686/PKGBUILD 2015-10-28 22:49:11 UTC (rev 249845)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.18.1
-pkgrel=2
-pkgdesc="The Control Center for GNOME"
-license=(GPL)
-arch=(i686 x86_64)
-depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
- gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
- libgtop libnm-gtk sound-theme-freedesktop upower libpwquality
- gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus
- cheese libgudev)
-makedepends=(intltool docbook-xsl modemmanager)
-optdepends=('system-config-printer: Printer settings'
- 'gnome-user-share: Bluetooth and WebDAV file sharing'
- 'rygel: media sharing'
- 'vino: screen sharing'
- 'openssh: remote login')
-groups=(gnome)
-url="http://www.gnome.org"
-install=gnome-control-center.install
-options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- sharing.patch)
-sha256sums=('9a59ec1fe03d873a75a669d933f6e37d8243252ff41850da2a9009e99b578b41'
- 'edfe12d2c08a4fcc3921c98f62faf813de732c267b2c28fe48bc1c83c3e3dbf6')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../sharing.patch
-}
-
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # Fix a warning
- chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
- chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}
Copied: gnome-control-center/repos/extra-i686/PKGBUILD (from rev 249844, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.18.1
+pkgrel=3
+pkgdesc="The Control Center for GNOME"
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
+ gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+ libgtop libnm-gtk sound-theme-freedesktop upower libpwquality
+ gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus
+ cheese libgudev)
+makedepends=(intltool docbook-xsl modemmanager gnome-common)
+optdepends=('system-config-printer: Printer settings'
+ 'gnome-user-share: Bluetooth and WebDAV file sharing'
+ 'rygel: media sharing'
+ 'vino: screen sharing'
+ 'openssh: remote login')
+groups=(gnome)
+url="http://www.gnome.org"
+install=gnome-control-center.install
+options=('!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ sharing.patch 0001-Add-systemd-user-services.patch)
+sha256sums=('9a59ec1fe03d873a75a669d933f6e37d8243252ff41850da2a9009e99b578b41'
+ 'edfe12d2c08a4fcc3921c98f62faf813de732c267b2c28fe48bc1c83c3e3dbf6'
+ '4170e89fb07fa6bee86f7bbac6e8bcabfe148b08c8f1a65998a8bb7f2241a601')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../sharing.patch
+ patch -Np1 -i ../0001-Add-systemd-user-services.patch
+ ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 srcdir=. gnome-autogen.sh
+}
+
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: extra-i686/gnome-control-center.install
===================================================================
--- extra-i686/gnome-control-center.install 2015-10-28 22:45:23 UTC (rev 249844)
+++ extra-i686/gnome-control-center.install 2015-10-28 22:49:11 UTC (rev 249845)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: gnome-control-center/repos/extra-i686/gnome-control-center.install (from rev 249844, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- extra-i686/gnome-control-center.install (rev 0)
+++ extra-i686/gnome-control-center.install 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: extra-i686/sharing.patch
===================================================================
--- extra-i686/sharing.patch 2015-10-28 22:45:23 UTC (rev 249844)
+++ extra-i686/sharing.patch 2015-10-28 22:49:11 UTC (rev 249845)
@@ -1,42 +0,0 @@
-From 781e4b14a23fd070000fe322ec3b1791d62bc5c4 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember at redhat.com>
-Date: Mon, 12 Oct 2015 15:13:26 +0200
-Subject: Fix syntax errors in gnome-sharing-panel.desktop translations
-
-Remove erroneous linefeeds from gnome-sharing-panel.desktop translations
-that break desktop file syntax.
----
- po/sr.po | 2 +-
- po/sr at latin.po | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/po/sr.po b/po/sr.po
-index 6efaf6d..4120c56 100644
---- a/po/sr.po
-+++ b/po/sr.po
-@@ -5128,7 +5128,7 @@ msgid ""
- "server;renderer;"
- msgstr ""
- "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;обекс;"
--"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;\n"
-+"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;"
- "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;obeks;"
- "medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;iscrtavač;"
-
-diff --git a/po/sr at latin.po b/po/sr at latin.po
-index 0947ba4..52e423c 100644
---- a/po/sr at latin.po
-+++ b/po/sr at latin.po
-@@ -5198,9 +5198,6 @@ msgid ""
- msgstr ""
- "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
- "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
--"iscrtavač;\n"
--"deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
--"obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
- "iscrtavač;"
-
- #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
---
-cgit v0.11.2
-
Copied: gnome-control-center/repos/extra-i686/sharing.patch (from rev 249844, gnome-control-center/trunk/sharing.patch)
===================================================================
--- extra-i686/sharing.patch (rev 0)
+++ extra-i686/sharing.patch 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,42 @@
+From 781e4b14a23fd070000fe322ec3b1791d62bc5c4 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember at redhat.com>
+Date: Mon, 12 Oct 2015 15:13:26 +0200
+Subject: Fix syntax errors in gnome-sharing-panel.desktop translations
+
+Remove erroneous linefeeds from gnome-sharing-panel.desktop translations
+that break desktop file syntax.
+---
+ po/sr.po | 2 +-
+ po/sr at latin.po | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/po/sr.po b/po/sr.po
+index 6efaf6d..4120c56 100644
+--- a/po/sr.po
++++ b/po/sr.po
+@@ -5128,7 +5128,7 @@ msgid ""
+ "server;renderer;"
+ msgstr ""
+ "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;обекс;"
+-"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;\n"
++"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;"
+ "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;obeks;"
+ "medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;iscrtavač;"
+
+diff --git a/po/sr at latin.po b/po/sr at latin.po
+index 0947ba4..52e423c 100644
+--- a/po/sr at latin.po
++++ b/po/sr at latin.po
+@@ -5198,9 +5198,6 @@ msgid ""
+ msgstr ""
+ "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
+ "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
+-"iscrtavač;\n"
+-"deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
+-"obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
+ "iscrtavač;"
+
+ #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+--
+cgit v0.11.2
+
Copied: gnome-control-center/repos/extra-x86_64/0001-Add-systemd-user-services.patch (from rev 249844, gnome-control-center/trunk/0001-Add-systemd-user-services.patch)
===================================================================
--- extra-x86_64/0001-Add-systemd-user-services.patch (rev 0)
+++ extra-x86_64/0001-Add-systemd-user-services.patch 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,144 @@
+From 2f8c902f4b9f86c8e3a6be758d78908e8cb50d0d Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 28 Oct 2015 23:27:19 +0100
+Subject: [PATCH] Add systemd user services
+
+Follows the code in GVFS.
+---
+ search-provider/Makefile.am | 16 ++++++++++-----
+ ...gnome-control-center-search-provider.service.in | 7 +++++++
+ ...g.gnome.ControlCenter.SearchProvider.service.in | 3 ++-
+ shell/Makefile.am | 24 ++++++++++++++--------
+ shell/gnome-control-center.service.in | 7 +++++++
+ shell/org.gnome.ControlCenter.service.in | 1 +
+ 6 files changed, 44 insertions(+), 14 deletions(-)
+ create mode 100644 search-provider/gnome-control-center-search-provider.service.in
+ create mode 100644 shell/gnome-control-center.service.in
+
+diff --git a/search-provider/Makefile.am b/search-provider/Makefile.am
+index 2314d66..864d895 100644
+--- a/search-provider/Makefile.am
++++ b/search-provider/Makefile.am
+@@ -38,17 +38,23 @@ gnome_control_center_search_provider_LDADD = \
+ $(top_builddir)/shell/libshell.la \
+ $(SHELL_LIBS)
+
+-CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
++CLEANFILES = $(BUILT_SOURCES) $(service_DATA) $(systemd_user_DATA)
+
+ servicedir = $(datadir)/dbus-1/services
+ service_DATA = $(service_in_files:.service.in=.service)
+-service_in_files = \
+- org.gnome.ControlCenter.SearchProvider.service.in
++service_in_files = org.gnome.ControlCenter.SearchProvider.service.in
+
+-org.gnome.ControlCenter.SearchProvider.service: org.gnome.ControlCenter.SearchProvider.service.in Makefile
++systemd_userdir = ${prefix}/lib/systemd/user
++systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
++systemd_user_in_files = gnome-control-center-search-provider.service.in
++
++$(service_DATA): $(service_in_files) Makefile
+ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+-EXTRA_DIST = $(service_in_files) org.gnome.ShellSearchProvider2.xml
++$(systemd_user_DATA): $(systemd_user_in_files) Makefile
++ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++
++EXTRA_DIST = $(service_in_files) $(systemd_user_in_files) org.gnome.ShellSearchProvider2.xml
+
+ searchproviderdir = $(datadir)/gnome-shell/search-providers
+ dist_searchprovider_DATA = gnome-control-center-search-provider.ini
+diff --git a/search-provider/gnome-control-center-search-provider.service.in b/search-provider/gnome-control-center-search-provider.service.in
+new file mode 100644
+index 0000000..4e56af1
+--- /dev/null
++++ b/search-provider/gnome-control-center-search-provider.service.in
+@@ -0,0 +1,7 @@
++[Unit]
++Description=GNOME Control Center Search Provider
++
++[Service]
++Type=dbus
++BusName=org.gnome.ControlCenter.SearchProvider
++ExecStart=@libexecdir@/gnome-control-center-search-provider
+diff --git a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in b/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
+index 81dd0c8..79b54a2 100644
+--- a/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
++++ b/search-provider/org.gnome.ControlCenter.SearchProvider.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.gnome.ControlCenter.SearchProvider
+-Exec=@libexecdir@/gnome-control-center-search-provider
+\ No newline at end of file
++Exec=@libexecdir@/gnome-control-center-search-provider
++SystemdService=gnome-control-center-search-provider.service
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index f72ebe9..bf78fd3 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -91,12 +91,19 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
+-# Dbus service file
+-servicefiledir = $(datadir)/dbus-1/services
+-servicefile_in_files = org.gnome.ControlCenter.service.in
+-servicefile_DATA = $(servicefile_in_files:.service.in=.service)
+-$(servicefile_DATA): $(servicefile_in_files) Makefile
+- $(AM_V_GEN) sed -e 's|[@]bindir[@]|$(bindir)|' $< > $@
++servicedir = $(datadir)/dbus-1/services
++service_DATA = $(service_in_files:.service.in=.service)
++service_in_files = org.gnome.ControlCenter.service.in
++
++systemd_userdir = ${prefix}/lib/systemd/user
++systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
++systemd_user_in_files = gnome-control-center.service.in
++
++$(service_DATA): $(service_in_files) Makefile
++ $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
++
++$(systemd_user_DATA): $(systemd_user_in_files) Makefile
++ $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
+ sysdir = $(datadir)/applications
+ sys_in_files = gnome-control-center.desktop.in
+@@ -111,11 +118,12 @@ completions/gnome-control-center: completions/gnome-control-center.in list-panel
+
+ EXTRA_DIST = \
+ gnome-control-center.desktop.in.in \
+- $(servicefile_in_files) \
++ $(service_in_files) \
++ $(systemd_user_in_files) \
+ $(completion_in_files) \
+ list-panel.sh
+
+-CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA)
++CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(service_DATA) $(systemd_user_DATA)
+ DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in
+
+ noinst_PROGRAMS = test-hostname
+diff --git a/shell/gnome-control-center.service.in b/shell/gnome-control-center.service.in
+new file mode 100644
+index 0000000..bd80ee0
+--- /dev/null
++++ b/shell/gnome-control-center.service.in
+@@ -0,0 +1,7 @@
++[Unit]
++Description=GNOME Control Center
++
++[Service]
++Type=dbus
++BusName=org.gnome.ControlCenter
++ExecStart=@bindir@/gnome-control-center
+diff --git a/shell/org.gnome.ControlCenter.service.in b/shell/org.gnome.ControlCenter.service.in
+index a515129..1f2489d 100644
+--- a/shell/org.gnome.ControlCenter.service.in
++++ b/shell/org.gnome.ControlCenter.service.in
+@@ -1,3 +1,4 @@
+ [D-BUS Service]
+ Name=org.gnome.ControlCenter
+ Exec=@bindir@/gnome-control-center
++SystemdService=gnome-control-center.service
+--
+2.6.1
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-10-28 22:45:23 UTC (rev 249844)
+++ extra-x86_64/PKGBUILD 2015-10-28 22:49:11 UTC (rev 249845)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.18.1
-pkgrel=2
-pkgdesc="The Control Center for GNOME"
-license=(GPL)
-arch=(i686 x86_64)
-depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
- gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
- libgtop libnm-gtk sound-theme-freedesktop upower libpwquality
- gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus
- cheese libgudev)
-makedepends=(intltool docbook-xsl modemmanager)
-optdepends=('system-config-printer: Printer settings'
- 'gnome-user-share: Bluetooth and WebDAV file sharing'
- 'rygel: media sharing'
- 'vino: screen sharing'
- 'openssh: remote login')
-groups=(gnome)
-url="http://www.gnome.org"
-install=gnome-control-center.install
-options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- sharing.patch)
-sha256sums=('9a59ec1fe03d873a75a669d933f6e37d8243252ff41850da2a9009e99b578b41'
- 'edfe12d2c08a4fcc3921c98f62faf813de732c267b2c28fe48bc1c83c3e3dbf6')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../sharing.patch
-}
-
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libexecdir=/usr/lib/$pkgname --disable-static
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- # Fix a warning
- chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d"
- chmod 700 "$pkgdir/usr/share/polkit-1/rules.d"
-}
Copied: gnome-control-center/repos/extra-x86_64/PKGBUILD (from rev 249844, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.18.1
+pkgrel=3
+pkgdesc="The Control Center for GNOME"
+license=(GPL)
+arch=(i686 x86_64)
+depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
+ gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
+ libgtop libnm-gtk sound-theme-freedesktop upower libpwquality
+ gnome-color-manager smbclient libmm-glib libgnomekbd grilo clutter-gtk libibus
+ cheese libgudev)
+makedepends=(intltool docbook-xsl modemmanager gnome-common)
+optdepends=('system-config-printer: Printer settings'
+ 'gnome-user-share: Bluetooth and WebDAV file sharing'
+ 'rygel: media sharing'
+ 'vino: screen sharing'
+ 'openssh: remote login')
+groups=(gnome)
+url="http://www.gnome.org"
+install=gnome-control-center.install
+options=('!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ sharing.patch 0001-Add-systemd-user-services.patch)
+sha256sums=('9a59ec1fe03d873a75a669d933f6e37d8243252ff41850da2a9009e99b578b41'
+ 'edfe12d2c08a4fcc3921c98f62faf813de732c267b2c28fe48bc1c83c3e3dbf6'
+ '4170e89fb07fa6bee86f7bbac6e8bcabfe148b08c8f1a65998a8bb7f2241a601')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../sharing.patch
+ patch -Np1 -i ../0001-Add-systemd-user-services.patch
+ ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 srcdir=. gnome-autogen.sh
+}
+
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+}
Deleted: extra-x86_64/gnome-control-center.install
===================================================================
--- extra-x86_64/gnome-control-center.install 2015-10-28 22:45:23 UTC (rev 249844)
+++ extra-x86_64/gnome-control-center.install 2015-10-28 22:49:11 UTC (rev 249845)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: gnome-control-center/repos/extra-x86_64/gnome-control-center.install (from rev 249844, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- extra-x86_64/gnome-control-center.install (rev 0)
+++ extra-x86_64/gnome-control-center.install 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: extra-x86_64/sharing.patch
===================================================================
--- extra-x86_64/sharing.patch 2015-10-28 22:45:23 UTC (rev 249844)
+++ extra-x86_64/sharing.patch 2015-10-28 22:49:11 UTC (rev 249845)
@@ -1,42 +0,0 @@
-From 781e4b14a23fd070000fe322ec3b1791d62bc5c4 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <klember at redhat.com>
-Date: Mon, 12 Oct 2015 15:13:26 +0200
-Subject: Fix syntax errors in gnome-sharing-panel.desktop translations
-
-Remove erroneous linefeeds from gnome-sharing-panel.desktop translations
-that break desktop file syntax.
----
- po/sr.po | 2 +-
- po/sr at latin.po | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/po/sr.po b/po/sr.po
-index 6efaf6d..4120c56 100644
---- a/po/sr.po
-+++ b/po/sr.po
-@@ -5128,7 +5128,7 @@ msgid ""
- "server;renderer;"
- msgstr ""
- "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;обекс;"
--"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;\n"
-+"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;"
- "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;obeks;"
- "medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;iscrtavač;"
-
-diff --git a/po/sr at latin.po b/po/sr at latin.po
-index 0947ba4..52e423c 100644
---- a/po/sr at latin.po
-+++ b/po/sr at latin.po
-@@ -5198,9 +5198,6 @@ msgid ""
- msgstr ""
- "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
- "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
--"iscrtavač;\n"
--"deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
--"obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
- "iscrtavač;"
-
- #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
---
-cgit v0.11.2
-
Copied: gnome-control-center/repos/extra-x86_64/sharing.patch (from rev 249844, gnome-control-center/trunk/sharing.patch)
===================================================================
--- extra-x86_64/sharing.patch (rev 0)
+++ extra-x86_64/sharing.patch 2015-10-28 22:49:11 UTC (rev 249845)
@@ -0,0 +1,42 @@
+From 781e4b14a23fd070000fe322ec3b1791d62bc5c4 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember at redhat.com>
+Date: Mon, 12 Oct 2015 15:13:26 +0200
+Subject: Fix syntax errors in gnome-sharing-panel.desktop translations
+
+Remove erroneous linefeeds from gnome-sharing-panel.desktop translations
+that break desktop file syntax.
+---
+ po/sr.po | 2 +-
+ po/sr at latin.po | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/po/sr.po b/po/sr.po
+index 6efaf6d..4120c56 100644
+--- a/po/sr.po
++++ b/po/sr.po
+@@ -5128,7 +5128,7 @@ msgid ""
+ "server;renderer;"
+ msgstr ""
+ "дели;дељење;ссх;безбедна шкољка;домаћин;назив;удаљено;радна површ;блутут;обекс;"
+-"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;\n"
++"медија;звук;аудио;снимак;видео;слике;фотографије;филмови;сервер;исцртавач;"
+ "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;obeks;"
+ "medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;iscrtavač;"
+
+diff --git a/po/sr at latin.po b/po/sr at latin.po
+index 0947ba4..52e423c 100644
+--- a/po/sr at latin.po
++++ b/po/sr at latin.po
+@@ -5198,9 +5198,6 @@ msgid ""
+ msgstr ""
+ "deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
+ "obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
+-"iscrtavač;\n"
+-"deli;deljenje;ssh;bezbedna školjka;domaćin;naziv;udaljeno;radna površ;blutut;"
+-"obeks;medija;zvuk;audio;snimak;video;slike;fotografije;filmovi;server;"
+ "iscrtavač;"
+
+ #: ../panels/sharing/org.gnome.controlcenter.remote-login-helper.policy.in.in.h:1
+--
+cgit v0.11.2
+
More information about the arch-commits
mailing list