Date: Thursday, July 31, 2014 @ 19:25:07 Author: bgyorgy Revision: 116650
archrelease: copy trunk to community-i686, community-x86_64 Added: cinnamon-control-center/repos/community-i686/PKGBUILD (from rev 116649, cinnamon-control-center/trunk/PKGBUILD) cinnamon-control-center/repos/community-i686/cinnamon-control-center.install (from rev 116649, cinnamon-control-center/trunk/cinnamon-control-center.install) cinnamon-control-center/repos/community-i686/upowerd-0.99-support.patch (from rev 116649, cinnamon-control-center/trunk/upowerd-0.99-support.patch) cinnamon-control-center/repos/community-x86_64/PKGBUILD (from rev 116649, cinnamon-control-center/trunk/PKGBUILD) cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install (from rev 116649, cinnamon-control-center/trunk/cinnamon-control-center.install) cinnamon-control-center/repos/community-x86_64/upowerd-0.99-support.patch (from rev 116649, cinnamon-control-center/trunk/upowerd-0.99-support.patch) Deleted: cinnamon-control-center/repos/community-i686/PKGBUILD cinnamon-control-center/repos/community-i686/cinnamon-control-center.install cinnamon-control-center/repos/community-x86_64/PKGBUILD cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install --------------------------------------------------+ /PKGBUILD | 120 +++++++++++++++++++++ /cinnamon-control-center.install | 22 +++ community-i686/PKGBUILD | 51 -------- community-i686/cinnamon-control-center.install | 11 - community-i686/upowerd-0.99-support.patch | 21 +++ community-x86_64/PKGBUILD | 51 -------- community-x86_64/cinnamon-control-center.install | 11 - community-x86_64/upowerd-0.99-support.patch | 21 +++ 8 files changed, 184 insertions(+), 124 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2014-07-31 17:24:57 UTC (rev 116649) +++ community-i686/PKGBUILD 2014-07-31 17:25:07 UTC (rev 116650) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Based on gnome-control-center: -# Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Jan de Groot <j...@archlinux.org> - -pkgname=cinnamon-control-center -pkgver=2.2.10 -pkgrel=1 -pkgdesc="The Control Center for Cinnamon" -arch=('i686' 'x86_64') -depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus' - 'libgnomekbd' 'network-manager-applet') -optdepends=('gnome-color-manager: for color management tasks') -makedepends=('intltool' 'gnome-common' 'docbook-xsl') -url="https://github.com/linuxmint/cinnamon-control-center" -install=cinnamon-control-center.install -license=('GPL') -options=('!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef') - -build() { - cd $pkgname-$pkgver - - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-systemd \ - --disable-update-mimedb - - #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 - - # Remove unused stuff - make -C panels/sound DESTDIR="$pkgdir" uninstall - make -C panels/sound/data DESTDIR="$pkgdir" install - make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA - rm -R "$pkgdir/usr/share/applications" - rm -R "$pkgdir/etc" - - # Fix a warning - chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d" - chmod 700 "$pkgdir/usr/share/polkit-1/rules.d" -} Copied: cinnamon-control-center/repos/community-i686/PKGBUILD (from rev 116649, cinnamon-control-center/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2014-07-31 17:25:07 UTC (rev 116650) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Based on gnome-control-center: +# Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Jan de Groot <j...@archlinux.org> + +pkgname=cinnamon-control-center +pkgver=2.2.10 +pkgrel=2 +pkgdesc="The Control Center for Cinnamon" +arch=('i686' 'x86_64') +depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus' + 'libgnomekbd' 'network-manager-applet') +optdepends=('gnome-color-manager: for color management tasks') +makedepends=('intltool' 'gnome-common' 'docbook-xsl') +url="https://github.com/linuxmint/cinnamon-control-center" +install=cinnamon-control-center.install +license=('GPL') +options=('!emptydirs') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" + "upowerd-0.99-support.patch") +sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef' + 'a1979c57addbdfc1832974f113c837507ab7ca4fec82ec5c9cf00f1db80d79ff') + +prepare() { + cd $pkgname-$pkgver + + # Compatibility fix for upower-0.99 (from Debian) + patch -Np1 -i ../upowerd-0.99-support.patch +} + +build() { + cd $pkgname-$pkgver + + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-systemd \ + --disable-update-mimedb + + #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 + + # Remove unused stuff + make -C panels/sound DESTDIR="$pkgdir" uninstall + make -C panels/sound/data DESTDIR="$pkgdir" install + make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA + rm -R "$pkgdir/usr/share/applications" + rm -R "$pkgdir/etc" + + # Fix a warning + chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d" + chmod 700 "$pkgdir/usr/share/polkit-1/rules.d" +} Deleted: community-i686/cinnamon-control-center.install =================================================================== --- community-i686/cinnamon-control-center.install 2014-07-31 17:24:57 UTC (rev 116649) +++ community-i686/cinnamon-control-center.install 2014-07-31 17:25:07 UTC (rev 116650) @@ -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 -} \ No newline at end of file Copied: cinnamon-control-center/repos/community-i686/cinnamon-control-center.install (from rev 116649, cinnamon-control-center/trunk/cinnamon-control-center.install) =================================================================== --- community-i686/cinnamon-control-center.install (rev 0) +++ community-i686/cinnamon-control-center.install 2014-07-31 17:25:07 UTC (rev 116650) @@ -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 +} \ No newline at end of file Copied: cinnamon-control-center/repos/community-i686/upowerd-0.99-support.patch (from rev 116649, cinnamon-control-center/trunk/upowerd-0.99-support.patch) =================================================================== --- community-i686/upowerd-0.99-support.patch (rev 0) +++ community-i686/upowerd-0.99-support.patch 2014-07-31 17:25:07 UTC (rev 116650) @@ -0,0 +1,21 @@ +--- a/panels/power/cc-power-panel.c ++++ b/panels/power/cc-power-panel.c +@@ -934,10 +934,18 @@ + -1); + switch (value_tmp) { + case CSD_POWER_ACTION_SUSPEND: ++#if UP_CHECK_VERSION(0,99,0) ++ enabled = cc_login1("CanSuspend"); ++#else + enabled = cc_login1("CanSuspend") || up_client_get_can_suspend (self->priv->up_client); ++#endif + break; + case CSD_POWER_ACTION_HIBERNATE: ++#if UP_CHECK_VERSION(0,99,0) ++ enabled = cc_login1("CanHibernate"); ++#else + enabled = cc_login1("CanHibernate") || up_client_get_can_hibernate (self->priv->up_client); ++#endif + break; + default: + enabled = TRUE; Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2014-07-31 17:24:57 UTC (rev 116649) +++ community-x86_64/PKGBUILD 2014-07-31 17:25:07 UTC (rev 116650) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> -# Based on gnome-control-center: -# Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Jan de Groot <j...@archlinux.org> - -pkgname=cinnamon-control-center -pkgver=2.2.10 -pkgrel=1 -pkgdesc="The Control Center for Cinnamon" -arch=('i686' 'x86_64') -depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus' - 'libgnomekbd' 'network-manager-applet') -optdepends=('gnome-color-manager: for color management tasks') -makedepends=('intltool' 'gnome-common' 'docbook-xsl') -url="https://github.com/linuxmint/cinnamon-control-center" -install=cinnamon-control-center.install -license=('GPL') -options=('!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef') - -build() { - cd $pkgname-$pkgver - - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-systemd \ - --disable-update-mimedb - - #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 - - # Remove unused stuff - make -C panels/sound DESTDIR="$pkgdir" uninstall - make -C panels/sound/data DESTDIR="$pkgdir" install - make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA - rm -R "$pkgdir/usr/share/applications" - rm -R "$pkgdir/etc" - - # Fix a warning - chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d" - chmod 700 "$pkgdir/usr/share/polkit-1/rules.d" -} Copied: cinnamon-control-center/repos/community-x86_64/PKGBUILD (from rev 116649, cinnamon-control-center/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2014-07-31 17:25:07 UTC (rev 116650) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com> +# Based on gnome-control-center: +# Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Jan de Groot <j...@archlinux.org> + +pkgname=cinnamon-control-center +pkgver=2.2.10 +pkgrel=2 +pkgdesc="The Control Center for Cinnamon" +arch=('i686' 'x86_64') +depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'cinnamon-menus' + 'libgnomekbd' 'network-manager-applet') +optdepends=('gnome-color-manager: for color management tasks') +makedepends=('intltool' 'gnome-common' 'docbook-xsl') +url="https://github.com/linuxmint/cinnamon-control-center" +install=cinnamon-control-center.install +license=('GPL') +options=('!emptydirs') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" + "upowerd-0.99-support.patch") +sha256sums=('5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef' + 'a1979c57addbdfc1832974f113c837507ab7ca4fec82ec5c9cf00f1db80d79ff') + +prepare() { + cd $pkgname-$pkgver + + # Compatibility fix for upower-0.99 (from Debian) + patch -Np1 -i ../upowerd-0.99-support.patch +} + +build() { + cd $pkgname-$pkgver + + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-systemd \ + --disable-update-mimedb + + #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 + + # Remove unused stuff + make -C panels/sound DESTDIR="$pkgdir" uninstall + make -C panels/sound/data DESTDIR="$pkgdir" install + make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA + rm -R "$pkgdir/usr/share/applications" + rm -R "$pkgdir/etc" + + # Fix a warning + chown 102:0 "$pkgdir/usr/share/polkit-1/rules.d" + chmod 700 "$pkgdir/usr/share/polkit-1/rules.d" +} Deleted: community-x86_64/cinnamon-control-center.install =================================================================== --- community-x86_64/cinnamon-control-center.install 2014-07-31 17:24:57 UTC (rev 116649) +++ community-x86_64/cinnamon-control-center.install 2014-07-31 17:25:07 UTC (rev 116650) @@ -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 -} \ No newline at end of file Copied: cinnamon-control-center/repos/community-x86_64/cinnamon-control-center.install (from rev 116649, cinnamon-control-center/trunk/cinnamon-control-center.install) =================================================================== --- community-x86_64/cinnamon-control-center.install (rev 0) +++ community-x86_64/cinnamon-control-center.install 2014-07-31 17:25:07 UTC (rev 116650) @@ -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 +} \ No newline at end of file Copied: cinnamon-control-center/repos/community-x86_64/upowerd-0.99-support.patch (from rev 116649, cinnamon-control-center/trunk/upowerd-0.99-support.patch) =================================================================== --- community-x86_64/upowerd-0.99-support.patch (rev 0) +++ community-x86_64/upowerd-0.99-support.patch 2014-07-31 17:25:07 UTC (rev 116650) @@ -0,0 +1,21 @@ +--- a/panels/power/cc-power-panel.c ++++ b/panels/power/cc-power-panel.c +@@ -934,10 +934,18 @@ + -1); + switch (value_tmp) { + case CSD_POWER_ACTION_SUSPEND: ++#if UP_CHECK_VERSION(0,99,0) ++ enabled = cc_login1("CanSuspend"); ++#else + enabled = cc_login1("CanSuspend") || up_client_get_can_suspend (self->priv->up_client); ++#endif + break; + case CSD_POWER_ACTION_HIBERNATE: ++#if UP_CHECK_VERSION(0,99,0) ++ enabled = cc_login1("CanHibernate"); ++#else + enabled = cc_login1("CanHibernate") || up_client_get_can_hibernate (self->priv->up_client); ++#endif + break; + default: + enabled = TRUE;