From 9c9a534c011e220f1fcdc4bd56c21d7d8cfc94a1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 25 Apr 2013 01:16:48 -0700 Subject: Thu Apr 25 01:16:48 PDT 2013 --- community/cairo-dock-plugins/PKGBUILD | 4 +- community/cairo-dock/PKGBUILD | 4 +- community/darktable/PKGBUILD | 6 +- community/dia/PKGBUILD | 10 +- community/fcitx/PKGBUILD | 16 +- community/gmic/PKGBUILD | 8 +- community/gnome-settings-daemon-compat/PKGBUILD | 26 +- .../flashback-rename.patch | 15 +- .../revert-input-sources.patch | 123 +++++ .../standalone-background-helper.patch | 4 +- .../standalone-media-keys-helper.patch | 564 +++++++++++++++++++++ .../gnome-settings-daemon-compat/xinput.patch | 36 ++ community/haskell-dlist/PKGBUILD | 8 +- community/haskell-pcre-light/PKGBUILD | 2 +- community/mongodb/PKGBUILD | 6 +- community/muffin/PKGBUILD | 16 +- community/muffin/switch-applications.patch | 20 + community/nemo/PKGBUILD | 9 +- community/nemo/remove-desktop-background.patch | 102 +++- community/nginx/PKGBUILD | 6 +- community/nodejs/PKGBUILD | 14 +- community/opencollada/PKGBUILD | 39 -- community/opencollada/opencollada.conf | 1 - community/pokerth/PKGBUILD | 20 +- community/pokerth/pokerth_game.pro.patch | 18 - 25 files changed, 939 insertions(+), 138 deletions(-) create mode 100644 community/gnome-settings-daemon-compat/revert-input-sources.patch create mode 100644 community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch create mode 100644 community/gnome-settings-daemon-compat/xinput.patch create mode 100644 community/muffin/switch-applications.patch delete mode 100644 community/opencollada/PKGBUILD delete mode 100644 community/opencollada/opencollada.conf delete mode 100644 community/pokerth/pokerth_game.pro.patch (limited to 'community') diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD index c2bba4804..cad086944 100755 --- a/community/cairo-dock-plugins/PKGBUILD +++ b/community/cairo-dock-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88459 2013-04-18 09:05:42Z alucryd $ +# $Id: PKGBUILD 88927 2013-04-24 21:31:30Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Tofe # Contributor: zhuqin @@ -7,7 +7,7 @@ pkgname=cairo-dock-plugins pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Cairo-Dock" url="https://launchpad.net/cairo-dock" license=('GPL') diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD index 3820dd2fc..8f910fe66 100755 --- a/community/cairo-dock/PKGBUILD +++ b/community/cairo-dock/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88485 2013-04-18 13:57:25Z alucryd $ +# $Id: PKGBUILD 88925 2013-04-24 21:20:34Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Tofe # Contributor: erm67 pkgname=cairo-dock pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Light eye-candy fully themable animated dock" arch=('i686' 'x86_64') url="https://launchpad.net/cairo-dock-core" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 6acd4b76f..7edf61f33 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88609 2013-04-20 16:45:02Z heftig $ +# $Id: PKGBUILD 88866 2013-04-24 14:09:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika @@ -6,14 +6,14 @@ pkgname=darktable pkgver=1.2 _pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt' - 'libsoup') + 'libsoup' 'gtk-engines') makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index 106c0ec9b..47d9a2810 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69446 2012-04-16 11:44:58Z spupykin $ +# $Id: PKGBUILD 88862 2013-04-24 13:59:45Z spupykin $ # Maintainer: Thorsten Töpper # Maintainer: Sergej Pupykin # Contributor: Juergen Hoetzel @@ -6,7 +6,7 @@ pkgname=dia pkgver=0.97.2 -pkgrel=3 +pkgrel=4 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64') license=('GPL') @@ -17,9 +17,9 @@ makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') options=('!libtool' 'docs' '!emptydirs') source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" - "dia-overflow-fix.patch") + "dia-crash.patch::https://git.gnome.org/browse/dia/patch/?id=213bdfe956bf8fe57c86316f68a09408fef1647e") md5sums=('1e1180a513fb567709b09bc19f12105e' - '8fd9a2ad35b5a6fd8c758d7c73dbfe66') + '2ad4fcfbfb561930a1d0335cc942a07b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,7 +29,7 @@ build() { sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" done sed -i 's#python2\.1#python2 python2.1#' configure -# patch -p1 <$srcdir/dia-overflow-fix.patch + patch -p1 <$srcdir/dia-crash.patch ./configure --prefix=/usr \ --with-cairo \ diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index ffe35ec54..3dca22164 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88842 2013-04-23 18:22:53Z fyan $ +# $Id: PKGBUILD 88848 2013-04-24 06:26:30Z fyan $ # Maintainer: Felix Yan # Contributor: Andrea Scarpino # Contributor: csslayer @@ -6,7 +6,7 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=7 +pkgrel=8 groups=('fcitx-im') arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" @@ -17,17 +17,17 @@ source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch + https://github.com/fcitx/fcitx/commit/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch ) build() { #source /etc/profile.d/qt4.sh - export CFLAGS+=" -Wall" - cd "$srcdir/$pkgbase-$pkgver" patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch" patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch" git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch" + patch -Np1 -i "$srcdir/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch" cd "$srcdir" mkdir -p build @@ -56,8 +56,9 @@ package_fcitx() { pkgdesc="Flexible Context-aware Input Tool with eXtension" depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \ 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \ - 'libxfixes' 'dbus-core' 'icu' 'enchant') - optdepends=('opencc: optional engine to do chinese convert' + 'libxfixes' 'dbus-core' 'icu') + optdepends=('enchant: for word predication support' + 'opencc: optional engine to do chinese convert' 'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method' 'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese' 'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates' @@ -130,4 +131,5 @@ package_fcitx-qt4() { md5sums=('6e291717c24615b9dc9bfaa2949af3a7' '246e36c2232f107ed1692a52ebc43c39' '6f420547bc8af9627db2e5290f758433' - '51e53377e1b83661f2896e25d1a46242') + '51e53377e1b83661f2896e25d1a46242' + '5e9f90817722a138b459b2bf6a926f96') diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index ba20f9ea9..19fd40f9b 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88611 2013-04-20 16:45:04Z heftig $ +# $Id: PKGBUILD 88860 2013-04-24 13:40:06Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -6,8 +6,8 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.5.1 -pkgrel=2 +pkgver=1.5.5.2 +pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" license=("custom:CeCILL") @@ -25,6 +25,8 @@ prepare() { find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile } +md5sums=('7d3a8e5cf9e866dd8979dc7c759a21a6' + '120319b0d6c81c5af186abe2281b79ca') build() { cd "${srcdir}/gmic-${pkgver}" diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD index 314d38cd1..108f1ab5a 100644 --- a/community/gnome-settings-daemon-compat/PKGBUILD +++ b/community/gnome-settings-daemon-compat/PKGBUILD @@ -1,35 +1,42 @@ -# $Id: PKGBUILD 88700 2013-04-21 22:24:08Z heftig $ +# $Id: PKGBUILD 88858 2013-04-24 12:55:15Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan Alexander Steffens (heftig) pkgname=gnome-settings-daemon-compat _pkgname=gnome-settings-daemon pkgver=3.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session" arch=('i686' 'x86_64') license=('GPL') -depends=('gnome-desktop') +depends=('gnome-settings-daemon') makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom') url="https://live.gnome.org/GnomeFlashback" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz standalone-background-helper.patch + standalone-media-keys-helper.patch draw-background-unconditionally.patch sessionisactive-port.patch + revert-input-sources.patch + xinput.patch flashback-rename.patch remove-libgsd-dependency.patch) sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' - '4c2206b9654bd2b2729297870696c87906e2386b492bae1052b94148e5ea370f' + 'f9781a17d7baa2777b16fa2c71fb6053612131cffcfffcc635d49f9dacb1e637' + '4776de33b1517976b308a9ce23661cd0ac68ddd2bcf41465c73f8a2e2d09d20c' '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a' '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915' - '57c66068f06599ea682325e9f5b92b751d8f0a4322b53371698f8539f709b101' + '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a' + 'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d' + '1edabf1a5a56d4b797ccdb7d5003bad396eebe98541d5aa330c9851340b68dfe' '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c') build() { cd $_pkgname-$pkgver - # Build background helper as a stand alone binary + # Build background and media keys helpers as a stand alone binary patch -Np1 -i ../standalone-background-helper.patch + patch -Np1 -i ../standalone-media-keys-helper.patch # Always draw background patch -Np1 -i ../draw-background-unconditionally.patch @@ -37,6 +44,10 @@ build() { # Port to gnome-session's SessionIsActive property patch -Np1 -i ../sessionisactive-port.patch + # Add compatibility patches for media keys plugin + patch -Np1 -i ../revert-input-sources.patch + patch -Np1 -i ../xinput.patch + # Remove libgsd dependency patch -Np1 -i ../remove-libgsd-dependency.patch @@ -50,12 +61,15 @@ build() { # https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make -C plugins/common make -C plugins/automount make -C plugins/background + make -C plugins/media-keys } package() { cd $_pkgname-$pkgver make -C plugins/automount DESTDIR="$pkgdir" install make -C plugins/background DESTDIR="$pkgdir" install + make -C plugins/media-keys DESTDIR="$pkgdir" install } diff --git a/community/gnome-settings-daemon-compat/flashback-rename.patch b/community/gnome-settings-daemon-compat/flashback-rename.patch index 2aaa9ce22..8f3816bef 100644 --- a/community/gnome-settings-daemon-compat/flashback-rename.patch +++ b/community/gnome-settings-daemon-compat/flashback-rename.patch @@ -1,6 +1,6 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in --- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-10 16:58:35.356800871 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 @@ -9,4 +9,4 @@ NoDisplay=true OnlyShowIn=GNOME;Unity; @@ -8,8 +8,17 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mou -AutostartCondition=GNOME3 if-session gnome-fallback +AutostartCondition=GNOME3 if-session gnome-flashback diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 15:57:02.136341000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 16:58:57.593982808 +0200 +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:32:47.290988000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 +@@ -9,4 +9,4 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback ++AutostartCondition=GNOME3 if-session gnome-flashback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:32:52.807791000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:35:16.714696636 +0200 @@ -9,4 +9,4 @@ NoDisplay=true OnlyShowIn=GNOME;Unity; diff --git a/community/gnome-settings-daemon-compat/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch new file mode 100644 index 000000000..dc769de4e --- /dev/null +++ b/community/gnome-settings-daemon-compat/revert-input-sources.patch @@ -0,0 +1,123 @@ +From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Wed, 12 Dec 2012 09:31:40 +0000 +Subject: Revert "media-keys: Add key bindings to switch input sources" + +These are now provided by gnome-shell. + +This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d. + +https://bugzilla.gnome.org/show_bug.cgi?id=690106 +--- +diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in +index b56b5d1..25e5f3e 100644 +--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in ++++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in +@@ -175,16 +175,6 @@ + <_summary>Magnifier zoom out + <_description>Binding for the magnifier to zoom out + +- +- '' +- <_summary>Switch input source +- <_description>Binding to select the next input source +- +- +- '' +- <_summary>Switch input source backward +- <_description>Binding to select the previous input source +- + + + +diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c +index e5977d0..cd6fbc2 100644 +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/plugins/media-keys/gsd-media-keys-manager.c +@@ -98,10 +98,6 @@ static const gchar introspection_xml[] = + #define VOLUME_STEP 6 /* percents for one volume button press */ + #define MAX_VOLUME 65536.0 + +-#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" +-#define KEY_CURRENT_INPUT_SOURCE "current" +-#define KEY_INPUT_SOURCES "sources" +- + #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) + + typedef struct { +@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager, + } + + static void +-do_switch_input_source_action (GsdMediaKeysManager *manager, +- MediaKeyType type) +-{ +- GSettings *settings; +- GVariant *sources; +- gint i, n; +- +- settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR); +- sources = g_settings_get_value (settings, KEY_INPUT_SOURCES); +- +- n = g_variant_n_children (sources); +- if (n < 2) +- goto out; +- +- i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE); +- +- if (type == SWITCH_INPUT_SOURCE_KEY) +- i += 1; +- else +- i -= 1; +- +- if (i < 0) +- i = n - 1; +- else if (i >= n) +- i = 0; +- +- g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i); +- +- out: +- g_variant_unref (sources); +- g_object_unref (settings); +-} +- +-static void + do_custom_action (GsdMediaKeysManager *manager, + MediaKey *key, + gint64 timestamp) +@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager, + case BATTERY_KEY: + do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp); + break; +- case SWITCH_INPUT_SOURCE_KEY: +- case SWITCH_INPUT_SOURCE_BACKWARD_KEY: +- do_switch_input_source_action (manager, type); +- break; + /* Note, no default so compiler catches missing keys */ + case CUSTOM_KEY: + g_assert_not_reached (); +diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h +index a16d0e7..437ed2c 100644 +--- a/plugins/media-keys/shortcuts-list.h ++++ b/plugins/media-keys/shortcuts-list.h +@@ -80,8 +80,6 @@ typedef enum { + KEYBOARD_BRIGHTNESS_DOWN_KEY, + KEYBOARD_BRIGHTNESS_TOGGLE_KEY, + BATTERY_KEY, +- SWITCH_INPUT_SOURCE_KEY, +- SWITCH_INPUT_SOURCE_BACKWARD_KEY, + CUSTOM_KEY + } MediaKeyType; + +@@ -148,8 +146,6 @@ static struct { + { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" }, + { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" }, + { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" }, +- { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL }, +- { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL }, + { BATTERY_KEY, NULL, "XF86Battery" }, + }; + +-- +cgit v0.9.1 diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch index ccbd18f9b..884f3031e 100644 --- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch +++ b/community/gnome-settings-daemon-compat/standalone-background-helper.patch @@ -417,7 +417,7 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in plugins/automount/gnome-fallback-mount-helper.desktop.in.in -+plugins/automount/gnome-fallback-background-helper.desktop.in.in ++plugins/background/gnome-fallback-background-helper.desktop.in.in plugins/automount/gsd-automount-manager.c plugins/automount/gsd-autorun.c -[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in @@ -431,7 +431,7 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daem data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in -+plugins/automount/gnome-fallback-background-helper.desktop.in ++plugins/background/gnome-fallback-background-helper.desktop.in plugins/automount/gnome-fallback-mount-helper.desktop.in plugins/power/org.gnome.settings-daemon.plugins.power.policy.in plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch new file mode 100644 index 000000000..dec5ff3e8 --- /dev/null +++ b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch @@ -0,0 +1,564 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in +--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-24 03:11:02.893859531 +0200 ++++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-24 13:43:11.128884064 +0200 +@@ -9,7 +9,6 @@ + + + +- + + + +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c 2013-04-24 13:43:11.132217470 +0200 +@@ -0,0 +1,65 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2010 Red Hat, Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ * ++ * Author: Tomas Bzatek ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++#include ++ ++#include "gsd-media-keys-manager.h" ++ ++int ++main (int argc, ++ char **argv) ++{ ++ GMainLoop *loop; ++ GsdMediaKeysManager *manager; ++ GError *error = NULL; ++ ++ g_type_init (); ++ gtk_init (&argc, &argv); ++ ++ bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++ textdomain (GETTEXT_PACKAGE); ++ ++ loop = g_main_loop_new (NULL, FALSE); ++ manager = gsd_media_keys_manager_new (); ++ ++ gsd_media_keys_manager_start (manager, &error); ++ ++ if (error != NULL) { ++ g_printerr ("Unable to start the media-keys manager: %s", ++ error->message); ++ ++ g_error_free (error); ++ _exit (1); ++ } ++ ++ g_main_loop_run (loop); ++ ++ gsd_media_keys_manager_stop (manager); ++ g_main_loop_unref (loop); ++ ++ return 0; ++} +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 13:43:11.132217470 +0200 +@@ -0,0 +1,12 @@ ++[Desktop Entry] ++_Name=Media keys ++_Comment=Handle media keys ++Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper ++Icon=drive-optical ++Terminal=false ++Type=Application ++Categories= ++NoDisplay=true ++OnlyShowIn=GNOME;Unity; ++X-GNOME-Autostart-Notify=true ++AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c 2013-04-24 13:43:11.132217470 +0200 +@@ -44,7 +44,6 @@ + #include + #endif + +-#include "gnome-settings-profile.h" + #include "gsd-marshal.h" + #include "gsd-media-keys-manager.h" + +@@ -622,8 +621,6 @@ + char **custom_paths; + int i; + +- gnome_settings_profile_start (NULL); +- + gdk_error_trap_push (); + + manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free); +@@ -661,8 +658,6 @@ + gdk_flush (); + if (gdk_error_trap_pop ()) + g_warning ("Grab failed for some keys, another application may already have access the them."); +- +- gnome_settings_profile_end (NULL); + } + + static void +@@ -2090,7 +2085,6 @@ + char *theme_name; + + g_debug ("Starting media_keys manager"); +- gnome_settings_profile_start (NULL); + + manager->priv->settings = g_settings_new (SETTINGS_BINDING_DIR); + g_signal_connect (G_OBJECT (manager->priv->settings), "changed", +@@ -2137,19 +2131,14 @@ + + /* Start filtering the events */ + for (l = manager->priv->screens; l != NULL; l = l->next) { +- gnome_settings_profile_start ("gdk_window_add_filter"); +- + g_debug ("adding key filter for screen: %d", + gdk_screen_get_number (l->data)); + + gdk_window_add_filter (gdk_screen_get_root_window (l->data), + (GdkFilterFunc) filter_key_events, + manager); +- gnome_settings_profile_end ("gdk_window_add_filter"); + } + +- gnome_settings_profile_end (NULL); +- + manager->priv->start_idle_id = 0; + + return FALSE; +@@ -2161,8 +2150,6 @@ + { + const char * const subsystems[] = { "input", "usb", "sound", NULL }; + +- gnome_settings_profile_start (NULL); +- + if (supports_xinput2_devices (&manager->priv->opcode) == FALSE) { + g_debug ("No Xinput2 support, disabling plugin"); + return TRUE; +@@ -2179,8 +2166,6 @@ + * The rest (grabbing and setting the keys) can happen in an + * idle. + */ +- gnome_settings_profile_start ("gvc_mixer_control_new"); +- + manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys"); + + g_signal_connect (manager->priv->volume, +@@ -2198,14 +2183,10 @@ + + gvc_mixer_control_open (manager->priv->volume); + +- gnome_settings_profile_end ("gvc_mixer_control_new"); +- + manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager); + + register_manager (manager_object); + +- gnome_settings_profile_end (NULL); +- + return TRUE; + } + +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,104 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2007 William Jon McCann +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2, or (at your option) +- * any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- * +- */ +- +-#include "config.h" +- +-#include +-#include +- +-#include "gnome-settings-plugin.h" +-#include "gsd-media-keys-plugin.h" +-#include "gsd-media-keys-manager.h" +- +-struct GsdMediaKeysPluginPrivate { +- GsdMediaKeysManager *manager; +-}; +- +-#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate)) +- +-GNOME_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin) +- +-static void +-gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin) +-{ +- plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin); +- +- g_debug ("GsdMediaKeysPlugin initializing"); +- +- plugin->priv->manager = gsd_media_keys_manager_new (); +-} +- +-static void +-gsd_media_keys_plugin_finalize (GObject *object) +-{ +- GsdMediaKeysPlugin *plugin; +- +- g_return_if_fail (object != NULL); +- g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object)); +- +- g_debug ("GsdMediaKeysPlugin finalizing"); +- +- plugin = GSD_MEDIA_KEYS_PLUGIN (object); +- +- g_return_if_fail (plugin->priv != NULL); +- +- if (plugin->priv->manager != NULL) { +- g_object_unref (plugin->priv->manager); +- } +- +- G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object); +-} +- +-static void +-impl_activate (GnomeSettingsPlugin *plugin) +-{ +- gboolean res; +- GError *error; +- +- g_debug ("Activating media_keys plugin"); +- +- error = NULL; +- res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error); +- if (! res) { +- g_warning ("Unable to start media_keys manager: %s", error->message); +- g_error_free (error); +- } +-} +- +-static void +-impl_deactivate (GnomeSettingsPlugin *plugin) +-{ +- g_debug ("Deactivating media_keys plugin"); +- gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager); +-} +- +-static void +-gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass) +-{ +- GObjectClass *object_class = G_OBJECT_CLASS (klass); +- GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass); +- +- object_class->finalize = gsd_media_keys_plugin_finalize; +- +- plugin_class->activate = impl_activate; +- plugin_class->deactivate = impl_deactivate; +- +- g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate)); +-} +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,59 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2007 William Jon McCann +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2, or (at your option) +- * any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- * +- */ +- +-#ifndef __GSD_MEDIA_KEYS_PLUGIN_H__ +-#define __GSD_MEDIA_KEYS_PLUGIN_H__ +- +-#include +-#include +-#include +- +-#include "gnome-settings-plugin.h" +- +-G_BEGIN_DECLS +- +-#define GSD_TYPE_MEDIA_KEYS_PLUGIN (gsd_media_keys_plugin_get_type ()) +-#define GSD_MEDIA_KEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin)) +-#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass)) +-#define GSD_IS_MEDIA_KEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN)) +-#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN)) +-#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass)) +- +-typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate; +- +-typedef struct +-{ +- GnomeSettingsPlugin parent; +- GsdMediaKeysPluginPrivate *priv; +-} GsdMediaKeysPlugin; +- +-typedef struct +-{ +- GnomeSettingsPluginClass parent_class; +-} GsdMediaKeysPluginClass; +- +-GType gsd_media_keys_plugin_get_type (void) G_GNUC_CONST; +- +-/* All the plugins must implement this function */ +-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); +- +-G_END_DECLS +- +-#endif /* __GSD_MEDIA_KEYS_PLUGIN_H__ */ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am 2013-04-24 14:26:01.414463895 +0200 +@@ -1,17 +1,11 @@ + icondir = $(datadir)/icons/hicolor + context = actions + +-plugin_name = media-keys +- +-NULL = +- + SUBDIRS = cut-n-paste +-plugin_LTLIBRARIES = libmedia-keys.la + + BUILT_SOURCES = \ + gsd-marshal.h \ +- gsd-marshal.c \ +- $(NULL) ++ gsd-marshal.c + + gsd-marshal.c: gsd-marshal.list + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@ +@@ -19,62 +13,16 @@ + gsd-marshal.h: gsd-marshal.list + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@ + +-libmedia_keys_la_SOURCES = \ +- gsd-media-keys-plugin.h \ +- gsd-media-keys-plugin.c \ +- gsd-media-keys-manager.h \ +- gsd-media-keys-manager.c \ +- gsd-osd-window.c \ +- gsd-osd-window.h \ +- gsd-osd-window-private.h \ +- shortcuts-list.h \ +- $(BUILT_SOURCES) \ +- $(NULL) +- +-libmedia_keys_la_CPPFLAGS = \ +- -I$(top_srcdir)/data/ \ +- -I$(top_srcdir)/gnome-settings-daemon \ +- -I$(top_srcdir)/plugins/common \ +- -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ +- -DBINDIR=\"$(bindir)\" \ +- -DPIXMAPDIR=\""$(pkgdatadir)"\" \ +- -DGTKBUILDERDIR=\""$(pkgdatadir)"\" \ +- -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ +- $(AM_CPPFLAGS) +- +-libmedia_keys_la_CFLAGS = \ +- $(PLUGIN_CFLAGS) \ +- $(SETTINGS_PLUGIN_CFLAGS) \ +- $(MEDIA_KEYS_CFLAGS) \ +- $(AM_CFLAGS) +- +-libmedia_keys_la_LDFLAGS = \ +- $(GSD_PLUGIN_LDFLAGS) +- +-libmedia_keys_la_LIBADD = \ +- $(top_builddir)/plugins/common/libcommon.la \ +- $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ +- $(MEDIA_KEYS_LIBS) \ +- $(SETTINGS_PLUGIN_LIBS) \ +- -lm +- +-plugin_in_files = \ +- media-keys.gnome-settings-plugin.in +- +-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) +- + noinst_PROGRAMS = test-media-window + + test_media_window_SOURCES = \ + gsd-osd-window.c \ + gsd-osd-window.h \ + gsd-osd-window-private.h \ +- test-media-window.c \ +- $(NULL) ++ test-media-window.c + + test_media_window_CPPFLAGS = \ + -I$(top_srcdir)/data/ \ +- -I$(top_srcdir)/gnome-settings-daemon \ + -I$(top_srcdir)/plugins/common \ + -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ + -DDATADIR=\""$(datadir)"\" \ +@@ -93,21 +41,19 @@ + $(SETTINGS_PLUGIN_LIBS) \ + -lm + +-libexec_PROGRAMS = gsd-test-media-keys ++libexec_PROGRAMS = gnome-fallback-media-keys-helper + +-gsd_test_media_keys_SOURCES = \ ++gnome_fallback_media_keys_helper_SOURCES = \ + gsd-media-keys-manager.c \ + gsd-media-keys-manager.h \ + gsd-osd-window.c \ + gsd-osd-window.h \ + gsd-osd-window-private.h \ +- test-media-keys.c \ +- $(BUILT_SOURCES) \ +- $(NULL) ++ gnome-fallback-media-keys-helper.c \ ++ $(BUILT_SOURCES) + +-gsd_test_media_keys_CPPFLAGS = \ ++gnome_fallback_media_keys_helper_CPPFLAGS = \ + -I$(top_srcdir)/data/ \ +- -I$(top_srcdir)/gnome-settings-daemon \ + -I$(top_srcdir)/plugins/common \ + -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ + -DBINDIR=\"$(bindir)\" \ +@@ -116,14 +62,12 @@ + -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ + $(AM_CPPFLAGS) + +-gsd_test_media_keys_CFLAGS = \ ++gnome_fallback_media_keys_helper_CFLAGS = \ + $(PLUGIN_CFLAGS) \ + $(SETTINGS_PLUGIN_CFLAGS) \ +- $(MEDIA_KEYS_CFLAGS) \ +- $(AM_CFLAGS) ++ $(MEDIA_KEYS_CFLAGS) + +-gsd_test_media_keys_LDADD = \ +- $(top_builddir)/gnome-settings-daemon/libgsd.la \ ++gnome_fallback_media_keys_helper_LDADD = \ + $(top_builddir)/plugins/common/libcommon.la \ + $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ + $(SETTINGS_DAEMON_LIBS) \ +@@ -131,17 +75,24 @@ + $(MEDIA_KEYS_LIBS) \ + -lm + ++autostartdir = $(sysconfdir)/xdg/autostart ++autostart_in_files = gnome-fallback-media-keys-helper.desktop.in ++autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in ++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) ++ ++$(autostart_in_files): $(autostart_in_in_files) ++ @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ ++@INTLTOOL_DESKTOP_RULE@ ++ + EXTRA_DIST = \ + gsd-marshal.list \ + README.media-keys-API \ + test-media-window-clutter.c \ +- $(plugin_in_files) ++ $(autostart_in_in_files) + + CLEANFILES = \ + $(BUILT_SOURCES) \ +- $(plugin_DATA) +- +-DISTCLEANFILES = \ +- $(plugin_DATA) ++ $(autostart_DATA) \ ++ $(autostart_in_files) + +-@GSD_INTLTOOL_PLUGIN_RULE@ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in 2012-04-07 15:21:20.000000000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,8 +0,0 @@ +-[GNOME Settings Plugin] +-Module=media-keys +-IAge=0 +-_Name=Media keys +-_Description=Media keys plugin +-Authors= +-Copyright=Copyright © 2007 +-Website= +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c 2012-06-01 22:02:53.000000000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,7 +0,0 @@ +-#define NEW gsd_media_keys_manager_new +-#define START gsd_media_keys_manager_start +-#define STOP gsd_media_keys_manager_stop +-#define MANAGER GsdMediaKeysManager +-#include "gsd-media-keys-manager.h" +- +-#include "test-plugin.h" +diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in +--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in 2013-04-24 03:11:02.897192946 +0200 ++++ gnome-settings-daemon-3.6.4/po/POTFILES.in 2013-04-24 13:43:11.132217470 +0200 +@@ -34,7 +34,7 @@ + [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in + plugins/media-keys/cut-n-paste/gvc-mixer-control.c + plugins/media-keys/gsd-media-keys-manager.c +-[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in ++plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in + plugins/mouse/gsd-mouse-manager.c + [type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in + plugins/power/gpm-common.c +diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip +--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip 2013-04-24 03:11:02.897192946 +0200 ++++ gnome-settings-daemon-3.6.4/po/POTFILES.skip 2013-04-24 13:43:11.132217470 +0200 +@@ -22,5 +22,6 @@ + data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in + plugins/background/gnome-fallback-background-helper.desktop.in + plugins/automount/gnome-fallback-mount-helper.desktop.in ++plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in + plugins/power/org.gnome.settings-daemon.plugins.power.policy.in + plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in diff --git a/community/gnome-settings-daemon-compat/xinput.patch b/community/gnome-settings-daemon-compat/xinput.patch new file mode 100644 index 000000000..67c8082cb --- /dev/null +++ b/community/gnome-settings-daemon-compat/xinput.patch @@ -0,0 +1,36 @@ +From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Thu, 07 Feb 2013 04:14:22 +0000 +Subject: Fix media-keys handling with GTK+ 3.7.8 + +GDK now requests XI 2.3 and if the X server supports that +version, subsequent requests for a lower version yield +a BadValue. Therefore, we need to change the code in +gsd-input-helper.c to request 2.3 as well. +--- +diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c +index 54427af..d5d2a2a 100644 +--- a/plugins/common/gsd-input-helper.c ++++ b/plugins/common/gsd-input-helper.c +@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode) + gdk_error_trap_push (); + + major = 2; +- minor = 0; ++ minor = 3; + + if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { + gdk_error_trap_pop_ignored (); +- /* try for 2.2, maybe gtk has already announced 2.2 support */ +- gdk_error_trap_push (); +- major = 2; +- minor = 2; +- if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { +- gdk_error_trap_pop_ignored (); + return FALSE; +- } + } + gdk_error_trap_pop_ignored (); + +-- +cgit v0.9.1 diff --git a/community/haskell-dlist/PKGBUILD b/community/haskell-dlist/PKGBUILD index 925c91c72..90c9573d3 100644 --- a/community/haskell-dlist/PKGBUILD +++ b/community/haskell-dlist/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 88875 2013-04-24 14:23:10Z jelle $ +# Maintainer: Daniel Wallace # Contributor: Don Stewart # Contributor: Lex Black @@ -5,13 +7,13 @@ pkgname=haskell-dlist pkgver=0.5 _hkgname=dlist _licensefile=LICENSE -pkgrel=1 +pkgrel=23 pkgdesc="Differences lists" url="http://code.haskell.org/~dons/code/dlist/" license=("BSD3") arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('ghc') +makedepends=('ghc=7.6.2') +depends=('ghc=7.6.2') options=('strip') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") sha256sums=('4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea') diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD index 7dcd58e6d..56ccb9c8c 100644 --- a/community/haskell-pcre-light/PKGBUILD +++ b/community/haskell-pcre-light/PKGBUILD @@ -3,7 +3,7 @@ _hkgname=pcre-light pkgname=haskell-pcre-light pkgver=0.4 -pkgrel=19 +pkgrel=20 pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions" url="http://code.haskell.org/~dons/code/pcre-light" license=(custom:BSD3) diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index ddd110ef1..6db2976d1 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88479 2013-04-18 12:55:25Z fyan $ +# $Id: PKGBUILD 88850 2013-04-24 10:16:56Z fyan $ # Maintainer: Felix Yan # Contributor: Sven-Hendrik Haase # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,7 +6,7 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') @@ -64,7 +64,7 @@ package() { mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true rm -r ${pkgdir}/usr/lib64 || true } -md5sums=('8c65fa1d678763dbc855b0129d1eea96' +md5sums=('ff6a9c90bdaca66a7e997ba8490fc222' '4839fe1d638187ca3226e8267b947318' '96ab4517b48974ce0e566d9746a75a4f' 'a9529e2a6e392ffecef7a9178394c814' diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 8732424f9..6c2e8d005 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 88697 2013-04-21 22:24:03Z heftig $ +# $Id: PKGBUILD 88909 2013-04-24 17:12:07Z bgyorgy $ +# Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" license=('GPL') -depends=('libsm' 'clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ +depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ 'libcanberra' 'startup-notification' 'zenity' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver") -md5sums=('30e329da6af10e825dace490f13e445f') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" + "switch-applications.patch") +md5sums=('30e329da6af10e825dace490f13e445f' + 'a5d5d76dc281277a8afc83d7affdcc7b') build() { cd linuxmint-muffin-* + # Fix windows switcher keybinding with default settings in GNOME 3.8 + patch -Np1 -i ../switch-applications.patch + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch new file mode 100644 index 000000000..61b727b57 --- /dev/null +++ b/community/muffin/switch-applications.patch @@ -0,0 +1,20 @@ +diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c +--- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c 2013-04-15 15:53:35.000000000 +0200 ++++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c 2013-04-24 18:37:54.028549911 +0200 +@@ -3774,14 +3774,14 @@ + handle_switch, META_TAB_LIST_GROUP); + + add_builtin_keybinding (display, +- "switch-windows", ++ "switch-applications", + SCHEMA_COMMON_KEYBINDINGS, + META_KEY_BINDING_REVERSES, + META_KEYBINDING_ACTION_SWITCH_WINDOWS, + handle_switch, META_TAB_LIST_NORMAL); + + add_builtin_keybinding (display, +- "switch-windows-backward", ++ "switch-applications-backward", + SCHEMA_COMMON_KEYBINDINGS, + REVERSES_AND_REVERSED, + META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD, diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index f2b15964c..00ab3bc7f 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 88773 2013-04-22 09:44:29Z faidoc $ +# $Id: PKGBUILD 88912 2013-04-24 17:42:52Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo pkgver=1.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" license=('GPL') depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2' - 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' - 'cinnamon') + 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql') makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common') optdepends=('gksu: Open as Root') options=('!emptydirs' '!libtool') @@ -21,7 +20,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkg "remove-desktop-background.patch") md5sums=('04c021da543e2562b712107c2be9a8c2' '9e170cc74eee901634b3367b06a209c6' - '700b595dfcf06e39f9dc3bdb7c81e086') + 'f10af52377e44e1efe8ec4934aa4d4d2') build() { cd linuxmint-nemo-* diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch index 793d5650c..0301cc820 100644 --- a/community/nemo/remove-desktop-background.patch +++ b/community/nemo/remove-desktop-background.patch @@ -1,7 +1,7 @@ From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Mon, 15 Apr 2013 18:44:35 -0400 -Subject: [PATCH 1/4] Don't render the background. Need to fix selected icon +Subject: [PATCH 1/6] Don't render the background. Need to fix selected icon style --- @@ -100,13 +100,13 @@ index 9c80c62..2d5c4e8 100644 GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget); -- -1.8.1.5 +1.8.1.6 From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Mon, 15 Apr 2013 20:03:03 -0400 -Subject: [PATCH 2/4] Remove nemo-desktop-background, the desktop window makes +Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes a transparent background and just uses the existing rendered background from muffin/g-s-d @@ -867,13 +867,13 @@ index 37cd8cb..5dec8b5 100644 } -- -1.8.1.5 +1.8.1.6 From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Mon, 15 Apr 2013 20:14:40 -0400 -Subject: [PATCH 3/4] Forgot an include +Subject: [PATCH 3/6] Forgot an include --- libnemo-private/nemo-icon-dnd.c | 1 - @@ -892,13 +892,13 @@ index 017c6a7..2ed073c 100644 #include #include -- -1.8.1.5 +1.8.1.6 From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Tue, 16 Apr 2013 18:00:01 -0400 -Subject: [PATCH 4/4] Change to use cinnamon background keys +Subject: [PATCH 4/6] Change to use cinnamon background keys --- libnemo-private/nemo-global-preferences.c | 2 +- @@ -960,5 +960,91 @@ index ab03b44..3ece32a 100644 g_free (uri); } -- -1.8.1.5 +1.8.1.6 + + +From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 22 Apr 2013 08:33:41 -0400 +Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when + cinnamon is not installed + +--- + libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c +index 336afc3..7eb04ef 100644 +--- a/libnemo-private/nemo-global-preferences.c ++++ b/libnemo-private/nemo-global-preferences.c +@@ -76,7 +76,25 @@ + nemo_desktop_preferences = g_settings_new("org.nemo.desktop"); + nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); + gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); +- cinnamon_background_preferences = g_settings_new("org.cinnamon.background"); + gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); + gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); ++ ++ const gchar * const *schema_list = g_settings_list_schemas (); ++ int i = 0; ++ gboolean has_cinnamon = FALSE; ++ if (schema_list != NULL) { ++ while (schema_list[i] != NULL) { ++ if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) { ++ has_cinnamon = TRUE; ++ break; ++ } ++ i++; ++ } ++ } ++ ++ if (has_cinnamon) { ++ cinnamon_background_preferences = g_settings_new ("org.cinnamon.background"); ++ } else { ++ cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background"); ++ } + } +-- +1.8.1.6 + + +From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 22 Apr 2013 09:31:49 -0400 +Subject: [PATCH 6/6] simplify schema check + +--- + libnemo-private/nemo-global-preferences.c | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c +index 7eb04ef..0470595 100644 +--- a/libnemo-private/nemo-global-preferences.c ++++ b/libnemo-private/nemo-global-preferences.c +@@ -79,20 +79,9 @@ + gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); + gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); + +- const gchar * const *schema_list = g_settings_list_schemas (); +- int i = 0; +- gboolean has_cinnamon = FALSE; +- if (schema_list != NULL) { +- while (schema_list[i] != NULL) { +- if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) { +- has_cinnamon = TRUE; +- break; +- } +- i++; +- } +- } +- +- if (has_cinnamon) { ++ GSettingsSchemaSource *schema_source; ++ schema_source = g_settings_schema_source_get_default(); ++ if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) { + cinnamon_background_preferences = g_settings_new ("org.cinnamon.background"); + } else { + cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background"); +-- +1.8.1.6 diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 48c00e91c..fca931cac 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87542 2013-04-02 19:17:59Z bpiotrowski $ +# $Id: PKGBUILD 88886 2013-04-24 15:32:13Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -7,7 +7,7 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.8 +pkgver=1.4.0 pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ backup=(${_cfgdir:1}/fastcgi.conf source=(http://nginx.org/download/nginx-$pkgver.tar.gz service logrotate) -sha256sums=('d2947c98c5bed311b1e6c04e35a730af92e40e2e6bfe9201fa7f404987457137' +sha256sums=('84aeb7a131fccff036dc80283dd98c989d2844eb84359cfe7c4863475de923a9' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 571fc58a8..738d4a395 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88176 2013-04-13 10:02:06Z bpiotrowski $ +# $Id: PKGBUILD 88884 2013-04-24 15:09:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.4 +pkgver=0.10.5 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('openssl' 'python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('1c960d2822447a9e4f7c46b832ff05e86743033c6643d644975af1cbf6a44fb8') +sha256sums=('1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd') build() { cd node-v${pkgver} @@ -47,15 +47,15 @@ check() { package() { cd node-v${pkgver} - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install # install docs as per user request - install -d $pkgdir/usr/share/doc/nodejs + install -d "$pkgdir"/usr/share/doc/nodejs cp -r doc/api/*.html \ - $pkgdir/usr/share/doc/nodejs + "$pkgdir"/usr/share/doc/nodejs install -D -m644 LICENSE \ - $pkgdir/usr/share/licenses/nodejs/LICENSE + "$pkgdir"/usr/share/licenses/nodejs/LICENSE } # vim:set ts=2 sw=2 et: diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD deleted file mode 100644 index a11e7afc8..000000000 --- a/community/opencollada/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 87935 2013-04-08 20:59:14Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -pkgname=opencollada -pkgver=20130408 -pkgrel=1 -pkgdesc="Stream based reader and writer library for COLLADA files" -arch=(i686 x86_64) -url="https://github.com/KhronosGroup/OpenCOLLADA" -license=('GPL') -depends=('libxml2' 'pcre') -makedepends=('git' 'cmake') -source=('opencollada.conf' - 'git://github.com/KhronosGroup/OpenCOLLADA.git') -md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d' - 'SKIP') - -build() { - cd "$srcdir"/OpenCOLLADA - - [[ -d build ]] && rm -r build - mkdir build && cd build - -# Activate these once pr#124 is merged -# -DUSE_SHARED=ON \ -# -DUSE_STATIC=OFF \ - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "$srcdir"/OpenCOLLADA/build - - make DESTDIR=$pkgdir install - - install -Dm644 $srcdir/opencollada.conf $pkgdir/etc/ld.so.conf.d/opencollada.conf -} - -# vim:set ts=2 sw=2 et: diff --git a/community/opencollada/opencollada.conf b/community/opencollada/opencollada.conf deleted file mode 100644 index cd7c2a5c5..000000000 --- a/community/opencollada/opencollada.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/opencollada diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index 3b544b250..a4c35b662 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 87656 2013-04-05 07:06:16Z cinelli $ -# Maintainer: Mateusz Herych -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 88844 2013-04-23 22:37:15Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Mateusz Herych +# Contributor: Bartłomiej Piotrowski # Contributor: Vasco Costa # Contributor: Federico Cinelli pkgname=pokerth _realname=PokerTH -pkgver=1.0 -pkgrel=6 +pkgver=1.0.1 +pkgrel=1 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64') url="http://www.pokerth.net/" @@ -15,17 +16,12 @@ license=('GPL' 'custom') depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' 'qt4' 'sdl_mixer' 'libircclient' 'tinyxml') makedepends=('boost') -source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2" - "pokerth_game.pro.patch") -md5sums=('1d8686b8968475cfc76e873a17a53efc' - '967b79b37407be5a68e6a864c2b7828a') +source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2") +md5sums=('c6dcf0ed68ab50af91371348ffad5d00') build() { cd "$srcdir/$_realname-$pkgver-src" - - sed -i '31 i #include ' src/net/common/ircthread.cpp - patch -Np2 < "$srcdir/pokerth_game.pro.patch" qmake-qt4 "$pkgname.pro" make } diff --git a/community/pokerth/pokerth_game.pro.patch b/community/pokerth/pokerth_game.pro.patch deleted file mode 100644 index e19ba3bcb..000000000 --- a/community/pokerth/pokerth_game.pro.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/PokerTH-1.0-src/pokerth_game.pro 2013-01-01 07:23:55.596627882 -0800 -+++ pokerth_game.pro 2013-04-04 11:14:16.583877931 -0700 -@@ -3,7 +3,6 @@ - isEmpty( PREFIX ){ - PREFIX =/usr - } -- - TEMPLATE = app - CODECFORSRC = UTF-8 - CONFIG += qt \ -@@ -21,6 +20,7 @@ - DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED - DEFINES += PREFIX=\"$${PREFIX}\" - TARGET = pokerth -+QMAKE_MOC = $$QMAKE_MOC -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - - # PRECOMPILED_HEADER = src/pch_game.h - -- cgit v1.2.3-54-g00ecf