From d4b7ceefdfb9c828799749419e8f8f7a36c2d7b8 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 22 Apr 2014 03:45:42 +0000 Subject: Tue Apr 22 03:41:19 UTC 2014 --- .../4f1e756e08e61840eb9a52de4debee30006ea31e.diff | 89 ++++++++++++++++++++++ community/caja/PKGBUILD | 8 +- community/cutter/PKGBUILD | 4 +- community/dart/PKGBUILD | 8 +- community/gedit-plugins/PKGBUILD | 6 +- community/gmic/PKGBUILD | 6 +- .../haskell-data-default-instances-base/PKGBUILD | 6 +- community/mednafen/PKGBUILD | 8 +- community/playpen/PKGBUILD | 2 +- 9 files changed, 114 insertions(+), 23 deletions(-) create mode 100644 community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff (limited to 'community') diff --git a/community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff b/community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff new file mode 100644 index 000000000..0ab9e1feb --- /dev/null +++ b/community/caja/4f1e756e08e61840eb9a52de4debee30006ea31e.diff @@ -0,0 +1,89 @@ +diff --git a/src/caja-application.c b/src/caja-application.c +index 3f4282c..47c86c8 100644 +--- a/src/caja-application.c ++++ b/src/caja-application.c +@@ -961,6 +961,15 @@ queue_accel_map_save_callback (GtkAccelMap *object, gchar *accel_path, + } + } + ++static gboolean ++desktop_changed_callback_connect (CajaApplication *application) ++{ ++ g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR, ++ G_CALLBACK(desktop_location_changed_callback), ++ G_OBJECT (application)); ++ return FALSE; ++} ++ + void + caja_application_startup (CajaApplication *application, + gboolean kill_shell, +@@ -1029,9 +1038,8 @@ caja_application_startup (CajaApplication *application, + + /* Monitor the preference to have the desktop */ + /* point to the Unix home folder */ +- g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR, +- G_CALLBACK(desktop_location_changed_callback), +- G_OBJECT (application)); ++ g_timeout_add_seconds (30, (GSourceFunc) desktop_changed_callback_connect, application); ++ + /* Create the other windows. */ + if (urls != NULL || !no_default_window) + { +diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c +index c7918e6..616e85b 100644 +--- a/src/caja-window-manage-views.c ++++ b/src/caja-window-manage-views.c +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -527,8 +528,10 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, + char *old_uri, *new_uri; + int new_slot_position; + GList *l; +- gboolean target_navigation = FALSE, target_same = FALSE; +- gboolean is_desktop, is_navigation; ++ gboolean target_navigation = FALSE; ++ gboolean target_same = FALSE; ++ gboolean is_desktop = FALSE; ++ gboolean is_navigation = FALSE; + + window = slot->pane->window; + +@@ -567,7 +570,12 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, + * otherwise it's the same window. + */ + if (is_desktop) { +- target_navigation = TRUE; ++ new_uri = g_file_get_uri (location); ++ if (g_str_has_prefix (new_uri, EEL_DESKTOP_URI)) ++ target_same = TRUE; ++ else ++ target_navigation = TRUE; ++ g_free (new_uri); + } else { + target_same = TRUE; + } +@@ -676,7 +684,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, + } + } + +- if ((target_window == window && target_slot == slot && ++ if (!(is_desktop && target_same) && (target_window == window && target_slot == slot && + old_location && g_file_equal (old_location, location))) { + + if (callback != NULL) { +@@ -688,7 +696,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot, + } + + begin_location_change (target_slot, location, old_location, new_selection, +- CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data); ++ (is_desktop && target_same) ? CAJA_LOCATION_CHANGE_RELOAD : CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data); + + /* Additionally, load this in all slots that have no location, this means + we load both panes in e.g. a newly opened dual pane window. */ diff --git a/community/caja/PKGBUILD b/community/caja/PKGBUILD index 6219b7a55..7150c7973 100644 --- a/community/caja/PKGBUILD +++ b/community/caja/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108196 2014-03-24 15:12:46Z flexiondotorg $ +# $Id: PKGBUILD 109911 2014-04-21 15:45:57Z flexiondotorg $ # Maintainer : Martin Wimpress pkgname=caja pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="The MATE shell and file manager" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -18,9 +18,9 @@ provides=('mate-file-manager') conflicts=('mate-file-manager') groups=('mate') source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" - "https://github.com/mate-desktop/caja/commit/4f1e756e08e61840eb9a52de4debee30006ea31e.diff") + "4f1e756e08e61840eb9a52de4debee30006ea31e.diff") sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f' - 'a8ae80fb181c999deeea5d597d7a8f7a174e62c6') + 'b2b619091643521b1e7263f883780abdf7bd7d71') install=${pkgname}.install prepare() { diff --git a/community/cutter/PKGBUILD b/community/cutter/PKGBUILD index b6d100938..2ca7f946b 100644 --- a/community/cutter/PKGBUILD +++ b/community/cutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 107022 2014-03-11 11:37:13Z spupykin $ +# $Id: PKGBUILD 109922 2014-04-21 15:53:49Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=cutter pkgver=1.03 -pkgrel=5 +pkgrel=6 pkgdesc="TCP/IP Connection cutting on Linux Firewalls and Routers" arch=('i686' 'x86_64') url="http://www.digitage.co.uk/digitage/software/linux-security/cutter" diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD index 89437f915..17da3de9a 100644 --- a/community/dart/PKGBUILD +++ b/community/dart/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109203 2014-04-11 11:58:40Z arodseth $ +# $Id: PKGBUILD 109924 2014-04-21 15:59:30Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: T. Jameson Little # Contributor: Usagi Ito @@ -6,7 +6,7 @@ # Contributor: Julien Nicoulaud pkgname=dart -pkgver=1.3 +pkgver=1.3.3 pkgrel=1 pkgdesc='The dart programming language SDK' arch=('x86_64' 'i686') @@ -18,10 +18,10 @@ options=('!strip') if [[ $CARCH == x86_64 ]]; then source=("$pkgname-$pkgver-64.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip") - sha256sums=('62de0c4bcc2c7fd5c3ef0667350d51415010f96815951f4dc0a4e97de2ec68d4') + sha256sums=('ca8ab3fc4d603a554b7f28f02db495907c91f4c6f0faa8f8be9fa6af59ce8560') else source=("$pkgname-$pkgver-32.zip::http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip") - sha256sums=('0b8d00479eae6f100bbfcdd04801e217373289e8897dded074abdfe947a9596c') + sha256sums=('b97d1e35d25683f6dd5e72c05b7c80bc804967b609ce2422549278619317a108') fi prepare() { diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 06a061e4e..622a25957 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102711 2013-12-17 18:09:28Z bgyorgy $ +# $Id: PKGBUILD 109904 2014-04-21 14:11:22Z jgc $ # Maintainer: Ionut Biru # Contributor: Alexander Rødseth # Contributor: Hugo Doria @@ -6,7 +6,7 @@ # Contributor: zhuqin pkgname=gedit-plugins -pkgver=3.10.1 +pkgver=3.12.1 pkgrel=1 pkgdesc="Plugins for gedit" arch=(x86_64 i686) @@ -20,7 +20,7 @@ optdepends=('gucharmap: for charmap plugin' options=('!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz") -sha256sums=('b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d') +sha256sums=('431adb6c8327d755329061f59d9f06e94819e398b7910751bbe46bc96679c67f') build() { cd $pkgname-$pkgver diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 21db3d9a1..4870394b9 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108387 2014-03-27 11:48:26Z spupykin $ +# $Id: PKGBUILD 109898 2014-04-21 10:42:07Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -6,14 +6,14 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.8.5 +pkgver=1.5.8.6 pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" license=("custom:CeCILL") makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz") -md5sums=('6bfa5cf4fff73d892578079b76fcba62') +md5sums=('0df62707961248869477c58f6c7d7605') prepare() { cd "${srcdir}/gmic-${pkgver}" diff --git a/community/haskell-data-default-instances-base/PKGBUILD b/community/haskell-data-default-instances-base/PKGBUILD index f433e99e1..5dbbb3202 100644 --- a/community/haskell-data-default-instances-base/PKGBUILD +++ b/community/haskell-data-default-instances-base/PKGBUILD @@ -2,17 +2,19 @@ _hkgname=data-default-instances-base pkgname=haskell-data-default-instances-base pkgver=0.0.1 -pkgrel=1 +pkgrel=3 pkgdesc="Default instances for types in base" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') makedepends=() -depends=('ghc=7.6.3' 'haskell-data-default-class') +depends=('ghc=7.8.2' 'haskell-data-default-class') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('37fc6531e0227bcf9cfbbf85f04e759d') +options=('staticlibs') + build() { cd ${srcdir}/${_hkgname}-${pkgver} runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD index 5002bd0b9..ebe711293 100644 --- a/community/mednafen/PKGBUILD +++ b/community/mednafen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108527 2014-03-27 20:02:12Z jsteel $ +# $Id: PKGBUILD 109894 2014-04-21 10:35:45Z jsteel $ # Maintainer: Jonathan Steel # Contributor: megadriver # Contributor: Angel Velasquez @@ -7,7 +7,7 @@ # Contributor: Hans-Kristian Arntzen pkgname=mednafen -pkgver=0.9.33.2 +pkgver=0.9.33.3 pkgrel=1 pkgdesc="A command-line multi-system gaming emulator" url="http://mednafen.sourceforge.net" @@ -16,9 +16,9 @@ arch=('i686' 'x86_64') depends=('libcdio' 'libsamplerate' 'sdl_net' 'zlib') makedepends=('mesa' 'glu') replaces=('mednafen-wip') -install="$pkgname.install" +install=$pkgname.install source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) -md5sums=('5ad015c5cbbefbf6b52fd6b972809b6a') +md5sums=('004b0854b7d47916160b0f4c4a0ead60') build() { cd "$srcdir"/$pkgname diff --git a/community/playpen/PKGBUILD b/community/playpen/PKGBUILD index 3e5d7a9f4..58232b930 100644 --- a/community/playpen/PKGBUILD +++ b/community/playpen/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Daniel Micay pkgname=playpen -pkgver=3 +pkgver=4 pkgrel=1 epoch=1 pkgdesc='A secure application sandbox using namespaces, cgroups and seccomp' -- cgit v1.2.3-54-g00ecf