diff options
Diffstat (limited to 'community')
19 files changed, 482 insertions, 88 deletions
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index e53dd9e88..8d6240c03 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91472 2013-05-23 01:19:04Z faidoc $ +# $Id: PKGBUILD 95589 2013-08-14 21:07:27Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com # Based on gnome-control-center: # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> @@ -6,7 +6,7 @@ pkgname=cinnamon-control-center pkgver=1.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet') @@ -18,10 +18,12 @@ license=('GPL') options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" "gnomerrlabeler.patch" - "idle-delay.patch") + "idle-delay.patch" + "remove_obex.patch") sha256sums=('78effed26a8fdce481cfe467889c9afdb6db78a961aec61b918c83c9781ccf4f' 'a01db243251c3da59c969d4538a35a63020d1e20866ff700ef273debd05456db' - '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') + '98227484162071744b5a336a5b3915c211f5eb1559034b3d40e4a9d790fe0e31' + '3df65b1f5e691d4a4634c05698da6df79cb23a0ebf71b201f23c48742b75b6e4') build() { cd $pkgname-$pkgver @@ -32,6 +34,9 @@ build() { # Runtime fix for GNOME 3.8 patch -Np1 -i "$srcdir/idle-delay.patch" + # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8 + patch -Np1 -i "$srcdir/remove_obex.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/community/cinnamon-control-center/idle-delay.patch b/community/cinnamon-control-center/idle-delay.patch index 7434018f5..bdf0a8a4a 100644 --- a/community/cinnamon-control-center/idle-delay.patch +++ b/community/cinnamon-control-center/idle-delay.patch @@ -1,10 +1,21 @@ -diff -Naur cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c ---- cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c 2013-04-15 16:04:38.000000000 +0200 -+++ cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c 2013-04-22 05:04:26.466092668 +0200 -@@ -1068,26 +1068,6 @@ +diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c +--- cinnamon-control-center-1.8.2.orig/panels/power/cc-power-panel.c 2013-08-14 22:10:57.491152667 +0200 ++++ cinnamon-control-center-1.8.2/panels/power/cc-power-panel.c 2013-08-14 21:58:36.533247961 +0200 +@@ -978,9 +978,6 @@ + has_lid = up_client_get_lid_is_present (self->priv->up_client); + + out: +- gtk_widget_set_visible (WID (priv->builder, "combobox_lid_ac"), has_lid); +- gtk_widget_set_visible (WID (priv->builder, "label_lid_action"), has_lid); +- gtk_widget_set_visible (WID (priv->builder, "combobox_lid_battery"), has_batteries && has_lid); + gtk_widget_set_visible (WID (priv->builder, "label_header_battery"), has_batteries); + gtk_widget_set_visible (WID (priv->builder, "label_header_ac"), has_batteries); + gtk_widget_set_visible (WID (priv->builder, "combobox_sleep_battery"), has_batteries); +@@ -1067,26 +1064,6 @@ + g_signal_connect (widget, "changed", G_CALLBACK (combo_enum_changed_cb), self); - +- - value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action"); - widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, - "combobox_lid_ac")); @@ -24,14 +35,82 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c cinn - g_signal_connect (widget, "changed", - G_CALLBACK (combo_enum_changed_cb), - self); -- + widget = WID (self->priv->builder, "vbox_power"); gtk_widget_reparent (widget, (GtkWidget *) self); - -diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c ---- cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c 2013-04-15 16:04:38.000000000 +0200 -+++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c 2013-04-22 14:15:28.440488342 +0200 -@@ -351,10 +351,6 @@ +diff -Naur cinnamon-control-center-1.8.2.orig/panels/power/power.ui cinnamon-control-center-1.8.2/panels/power/power.ui +--- cinnamon-control-center-1.8.2.orig/panels/power/power.ui 2013-05-22 18:25:19.000000000 +0200 ++++ cinnamon-control-center-1.8.2/panels/power/power.ui 2013-08-14 21:57:54.872240364 +0200 +@@ -222,50 +222,6 @@ + </packing> + </child> + <child> +- <object class="GtkLabel" id="label_lid_action"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="halign">end</property> +- <property name="label" translatable="yes">When the lid is closed</property> +- </object> +- <packing> +- <property name="left_attach">0</property> +- <property name="top_attach">3</property> +- </packing> +- </child> +- <child> +- <object class="GtkComboBox" id="combobox_lid_battery"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="model">liststore_lid</property> +- <property name="hexpand">True</property> +- <accessibility> +- <relation type="labelled-by" target="label_header_battery"/> +- <relation type="labelled-by" target="label_lid_action"/> +- </accessibility> +- </object> +- <packing> +- <property name="left_attach">1</property> +- <property name="top_attach">3</property> +- </packing> +- </child> +- <child> +- <object class="GtkComboBox" id="combobox_lid_ac"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="model">liststore_lid</property> +- <property name="hexpand">True</property> +- <accessibility> +- <relation type="labelled-by" target="label_header_ac"/> +- <relation type="labelled-by" target="label_lid_action"/> +- </accessibility> +- </object> +- <packing> +- <property name="left_attach">2</property> +- <property name="top_attach">3</property> +- </packing> +- </child> +- <child> + <object class="GtkSeparator" id="separator_indicator"> + <property name="visible">True</property> + <property name="can_focus">False</property> +@@ -468,12 +424,10 @@ + </object> + <object class="GtkSizeGroup" id="sizegroup_combos"> + <widgets> +- <widget name="combobox_lid_battery"/> +- <widget name="combobox_lid_ac"/> + <widget name="combobox_critical"/> + <widget name="combobox_sleep_battery"/> + <widget name="combobox_sleep_ac"/> + <widget name="combobox_sleep_ac"/> + </widgets> + </object> +-</interface> +\ No newline at end of file ++</interface> +diff -Naur cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c +--- cinnamon-control-center-1.8.2.orig/panels/screen/cc-screen-panel.c 2013-08-14 22:10:57.541153876 +0200 ++++ cinnamon-control-center-1.8.2/panels/screen/cc-screen-panel.c 2013-08-14 21:55:41.905692072 +0200 +@@ -352,10 +352,6 @@ 1, &value, -1); @@ -42,7 +121,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c ci set_idle_delay_from_dpms (self, value); } -@@ -384,7 +380,7 @@ +@@ -385,7 +381,7 @@ { GtkTreeIter iter; GtkTreeModel *model; @@ -51,7 +130,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c ci gint value_tmp, value_prev; gboolean ret; guint i; -@@ -399,7 +395,7 @@ +@@ -400,7 +396,7 @@ i = 0; /* try to make the UI match the AC setting */ @@ -60,7 +139,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c ci do { gtk_tree_model_get (model, &iter, -@@ -510,7 +506,7 @@ +@@ -511,7 +507,7 @@ /* bind the auto dim checkbox */ widget = WID ("screen_auto_reduce_checkbutton"); g_settings_bind (self->priv->gsd_settings, diff --git a/community/cinnamon-control-center/remove_obex.patch b/community/cinnamon-control-center/remove_obex.patch new file mode 100644 index 000000000..abcf1be88 --- /dev/null +++ b/community/cinnamon-control-center/remove_obex.patch @@ -0,0 +1,106 @@ +--- a/panels/bluetooth/bluetooth.ui ++++ b/panels/bluetooth/bluetooth.ui +@@ -543,34 +543,6 @@ + <property name="position">3</property> + </packing> + </child> +- <child> +- <object class="GtkBox" id="browse_box"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <child> +- <placeholder/> +- </child> +- <child> +- <object class="GtkButton" id="browse_button"> +- <property name="label" translatable="yes">Browse Files...</property> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- <property name="use_action_appearance">False</property> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">False</property> +- <property name="pack_type">end</property> +- <property name="position">1</property> +- </packing> +- </child> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">4</property> +- </packing> +- </child> + </object> + <packing> + <property name="expand">False</property> +--- a/panels/bluetooth/cc-bluetooth-panel.c ++++ b/panels/bluetooth/cc-bluetooth-panel.c +@@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc + gtk_widget_hide (WID ("keyboard_box")); + gtk_widget_hide (WID ("sound_box")); + gtk_widget_hide (WID ("mouse_box")); +- gtk_widget_hide (WID ("browse_box")); + gtk_widget_hide (WID ("send_box")); + + bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser)); +@@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc + + uuids = (const char **) g_value_get_boxed (&value); + for (i = 0; uuids && uuids[i] != NULL; i++) { +- if (g_str_equal (uuids[i], "OBEXObjectPush")) ++ if (g_str_equal (uuids[i], "OBEXObjectPush")) { + gtk_widget_show (WID ("send_box")); +- else if (g_str_equal (uuids[i], "OBEXFileTransfer")) +- gtk_widget_show (WID ("browse_box")); ++ break; ++ } + } + g_value_unset (&value); + } +@@ -538,34 +537,6 @@ send_callback (GtkButton *button, + g_free (alias); + } + +-static void +-mount_finish_cb (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GError *error = NULL; +- +- if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) { +- g_printerr ("Failed to mount OBEX volume: %s", error->message); +- g_error_free (error); +- return; +- } +-} +- +-static void +-browse_callback (GtkButton *button, +- CcBluetoothPanel *self) +-{ +- char *bdaddr; +- +- bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser)); +- +- bluetooth_browse_address (G_OBJECT (self), bdaddr, +- GDK_CURRENT_TIME, mount_finish_cb, NULL); +- +- g_free (bdaddr); +-} +- + /* Visibility/Discoverable */ + static void discoverable_changed (BluetoothClient *client, + GParamSpec *spec, +@@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane + G_CALLBACK (keyboard_callback), self); + g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link", + G_CALLBACK (sound_callback), self); +- g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked", +- G_CALLBACK (browse_callback), self); + g_signal_connect (G_OBJECT (WID ("send_button")), "clicked", + G_CALLBACK (send_callback), self); + g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active", + diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index de0a67a9a..0571d4230 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94121 2013-07-14 15:37:15Z faidoc $ +# $Id: PKGBUILD 95592 2013-08-14 21:28:25Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.8.8 -pkgrel=2 +pkgrel=4 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -26,19 +26,27 @@ optdepends=('cinnamon-control-center: extended configurations for Cinnamon' options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz" + "remove_GC.patch" "keyboard_applet.patch" "fix-control-center-check.patch" "gnome-3.8.patch" "switch-applications.patch" "fallback-helpers.patch" - "idle-dim.patch") + "idle-dim.patch" + "background.patch" + "bluetooth_obex_transfer.patch" + "disable-mpris-support.patch") sha256sums=('1bce982e6333e7bd27a1df9f37eb9139360c2fef667c7a998a79f216d4a0921d' + '3d362efd15f8cfeca1713f5bcf88d4be787b39d7c7f24b73cd13f867af33a680' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '01508c4f41664d5e29f700dc77c9f5c5441f128ab759f0ae8325c5fdda70b00e' '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262' 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' - 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100') + 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100' + '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f' + '4497f3e0a97c364845d8a3a3b3b75e7dc9d475dc39f56b2106f8c4b9e5111ac2' + 'f1eb8110718434e1dc2cf0a308757a787390382dfccd1c8cc80488b93cf6a9f7') build() { cd ${srcdir}/Cinnamon* @@ -49,6 +57,9 @@ build() { files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + # Fix crasher when disconnecting from wifi + patch -Np1 -i ../remove_GC.patch + # Fix Keyboard applet # https://github.com/linuxmint/Cinnamon/issues/1337 patch -Np1 -i ../keyboard_applet.patch @@ -68,6 +79,15 @@ build() { # Fix brightness applet for GNOME 3.8 patch -Np1 -i ../idle-dim.patch + # Fix missing backgrounds + patch -Np1 -i ../background.patch + + # Remove "Browse Files..." option as it's gone from gnome-bluetooth 3.8 + patch -Np1 -i ../bluetooth_obex_transfer.patch + + # Disable MPRIS support (workaround for FS#35282) + patch -Np1 -i ../disable-mpris-support.patch + ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/cinnamon \ @@ -82,4 +102,10 @@ build() { package() { cd ${srcdir}/Cinnamon* make DESTDIR="${pkgdir}" install + + # Remove leftover files after patching + find "$pkgdir" -type f -name *.orig | xargs rm + + # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center + sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' "$pkgdir/usr/share/applications/cinnamon-settings.desktop" } diff --git a/community/cinnamon/background.patch b/community/cinnamon/background.patch new file mode 100644 index 000000000..ccfdce4cf --- /dev/null +++ b/community/cinnamon/background.patch @@ -0,0 +1,16 @@ +--- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py ++++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py +@@ -334,10 +334,9 @@ class BackgroundWallpaperPane (Gtk.VBox) + + def update_icon_view(self): + pictures_list = [] +- if os.path.exists("/usr/share/cinnamon-background-properties"): +- for i in os.listdir("/usr/share/cinnamon-background-properties"): +- if i.endswith(".xml"): +- pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/cinnamon-background-properties", i)) ++ for i in os.listdir("/usr/share/gnome-background-properties"): ++ if i.endswith(".xml"): ++ pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/gnome-background-properties", i)) + + path = os.path.join(os.getenv("HOME"), ".cinnamon", "backgrounds") + if os.path.exists(path): diff --git a/community/cinnamon/bluetooth_obex_transfer.patch b/community/cinnamon/bluetooth_obex_transfer.patch new file mode 100644 index 000000000..0e632c48b --- /dev/null +++ b/community/cinnamon/bluetooth_obex_transfer.patch @@ -0,0 +1,25 @@ +--- a/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js +@@ -455,22 +455,6 @@ MyApplet.prototype = { + this._applet.send_to_address(device.bdaddr, device.alias); + })); + } +- if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_FILE_TRANSFER) { +- item.menu.addAction(_("Browse Files..."), Lang.bind(this, function(event) { +- this._applet.browse_address(device.bdaddr, event.get_time(), +- Lang.bind(this, function(applet, result) { +- try { +- applet.browse_address_finish(result); +- } catch (e) { +- this._ensureSource(); +- this._source.notify(new MessageTray.Notification(this._source, +- _("Bluetooth"), +- _("Error browsing device"), +- { body: _("The requested device cannot be browsed, error is '%s'").format(e) })); +- } +- })); +- })); +- } + + switch (device.type) { + case GnomeBluetoothApplet.Type.KEYBOARD: diff --git a/community/cinnamon/disable-mpris-support.patch b/community/cinnamon/disable-mpris-support.patch new file mode 100644 index 000000000..dff615f4f --- /dev/null +++ b/community/cinnamon/disable-mpris-support.patch @@ -0,0 +1,17 @@ +diff -Naur Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +--- Cinnamon-1.8.8.orig/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js 2013-08-14 16:44:19.955273614 +0000 ++++ Cinnamon-1.8.8/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js 2013-08-14 16:46:34.171029992 +0000 +@@ -600,13 +600,6 @@ + + // menu not showed by default + this._players = {}; +- // watch players +- for (var p=0; p<compatible_players.length; p++) { +- Gio.DBus.session.watch_name('org.mpris.MediaPlayer2.'+compatible_players[p], Gio.BusNameWatcherFlags.NONE, +- Lang.bind(this, this._addPlayer), +- Lang.bind(this, this._removePlayer) +- ); +- } + + this._control = new Gvc.MixerControl({ name: 'Cinnamon Volume Control' }); + this._control.connect('state-changed', Lang.bind(this, this._onControlStateChanged)); diff --git a/community/cinnamon/remove_GC.patch b/community/cinnamon/remove_GC.patch new file mode 100644 index 000000000..7bd8e45a6 --- /dev/null +++ b/community/cinnamon/remove_GC.patch @@ -0,0 +1,124 @@ +--- a/src/cinnamon-global.c ++++ b/src/cinnamon-global.c +@@ -1399,35 +1399,6 @@ cinnamon_global_reexec_self (CinnamonGlo + g_ptr_array_free (arr, TRUE); + } + +-/** +- * cinnamon_global_gc: +- * @global: A #CinnamonGlobal +- * +- * Start a garbage collection process. For more information, see +- * https://developer.mozilla.org/En/JS_GC +- */ +-void +-cinnamon_global_gc (CinnamonGlobal *global) +-{ +- JSContext *context = gjs_context_get_native_context (global->js_context); +- +- JS_GC (context); +-} +- +-/** +- * cinnamon_global_maybe_gc: +- * @global: A #CinnamonGlobal +- * +- * Start a garbage collection process when it would free up enough memory +- * to be worth the amount of time it would take +- * https://developer.mozilla.org/en/SpiderMonkey/JSAPI_Reference/JS_MaybeGC +- */ +-void +-cinnamon_global_maybe_gc (CinnamonGlobal *global) +-{ +- gjs_context_maybe_gc (global->js_context); +-} +- + static void + cinnamon_global_on_gc (GjsContext *context, + CinnamonGlobal *global) +@@ -1768,13 +1768,6 @@ run_leisure_functions (gpointer data) + if (global->work_count > 0) + return FALSE; + +- /* Previously we called gjs_maybe_gc(). However, it simply doesn't +- * trigger often enough. Garbage collection is very fast here, so +- * let's just aggressively GC. This will help avoid both heap +- * fragmentation, and the GC kicking in when we don't want it to. +- */ +- gjs_context_gc (global->js_context); +- + /* No leisure closures, so we are done */ + if (global->leisure_closures == NULL) + return FALSE; +--- a/src/cinnamon-global.h ++++ b/src/cinnamon-global.h +@@ -88,10 +88,6 @@ void cinnamon_global_set_pointer + int y); + + +-/* JavaScript utilities */ +-void cinnamon_global_gc (CinnamonGlobal *global); +-void cinnamon_global_maybe_gc (CinnamonGlobal *global); +- + typedef struct { + guint glibc_uordblks; + + + +--- a/js/perf/core.js ++++ b/js/perf/core.js +@@ -1,5 +1,7 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + ++const System = imports.system; ++ + const Main = imports.ui.main; + const Scripting = imports.ui.scripting; + +@@ -99,7 +101,7 @@ function run() { + Main.overview.hide(); + yield Scripting.waitLeisure(); + +- global.gc(); ++ System.gc(); + yield Scripting.sleep(1000); + Scripting.collectStatistics(); + Scripting.scriptEvent('afterShowHide'); +--- a/js/ui/lookingGlass.js ++++ b/js/ui/lookingGlass.js +@@ -11,6 +11,7 @@ const St = imports.gi.St; + const Cinnamon = imports.gi.Cinnamon; + const Signals = imports.signals; + const Lang = imports.lang; ++const System = imports.system; + + const History = imports.misc.history; + const Extension = imports.ui.extension; +@@ -680,7 +681,7 @@ Memory.prototype = { + + this._gcbutton = new St.Button({ label: 'Full GC', + style_class: 'lg-obj-inspector-button' }); +- this._gcbutton.connect('clicked', Lang.bind(this, function () { global.gc(); this._renderText(); })); ++ this._gcbutton.connect('clicked', Lang.bind(this, function () { System.gc(); this._renderText(); })); + this.actor.add(this._gcbutton, { x_align: St.Align.START, + x_fill: false }); + +--- a/js/ui/lookingGlassDBus.js ++++ b/js/ui/lookingGlassDBus.js +@@ -1,5 +1,7 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + ++const System = imports.system; ++ + const Gio = imports.gi.Gio; + const Main = imports.ui.main; + const Extension = imports.ui.extension; +@@ -99,7 +101,7 @@ CinnamonLookingGlass.prototype = { + }, + + FullGc: function() { +- global.gc(); ++ System.gc(); + }, + + Inspect: function(path) { diff --git a/community/golangide/PKGBUILD b/community/liteide/PKGBUILD index 9191dd88d..bbe5f92c1 100644 --- a/community/golangide/PKGBUILD +++ b/community/liteide/PKGBUILD @@ -1,21 +1,23 @@ -#$Id: PKGBUILD 94279 2013-07-18 19:28:01Z arodseth $ +# $Id: PKGBUILD 95569 2013-08-14 12:28:29Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> -pkgname=golangide +pkgname=liteide pkgver=19 pkgrel=1 -pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' +pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")' license=('LGPL') arch=('x86_64' 'i686') url='https://github.com/visualfc/liteide' depends=('go' 'libpng12' 'glib2' 'qt5-base' 'qt5-webkit') +replaces=('golangide') +conflicts=('golangide') makedepends=('gendesk') options=('!strip') source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip" - 'golangide.png' - 'golangide.sh') + 'liteide.png' + 'liteide.sh') sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04') @@ -31,11 +33,9 @@ prepare() { build() { cd "$srcdir/liteide-x$pkgver/build" - msg2 'Compiling...' QTDIR=/usr ./build_linux.sh # Fixing insecure RPATH, need to test if this is still needed - msg2 'Fixing...' cd ../liteidex find . -name "*.so" -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; find . -name liteide -type f -exec sed -i 's|/home/win|/usr/lib/|g' {} \; diff --git a/community/golangide/golangide.png b/community/liteide/liteide.png Binary files differindex 1aed5e1dd..1aed5e1dd 100644 --- a/community/golangide/golangide.png +++ b/community/liteide/liteide.png diff --git a/community/golangide/golangide.sh b/community/liteide/liteide.sh index d7d0772b5..d7d0772b5 100644 --- a/community/golangide/golangide.sh +++ b/community/liteide/liteide.sh diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index ebc095a12..2b10f3b3b 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90561 2013-05-13 08:02:43Z lfleischer $ +# $Id: PKGBUILD 95562 2013-08-14 09:31:13Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif pkgver=1.0.5 -pkgrel=3 +pkgrel=4 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64') url='http://minbif.im/' diff --git a/community/minbif/minbif.install b/community/minbif/minbif.install index 264763407..719f835c8 100644 --- a/community/minbif/minbif.install +++ b/community/minbif/minbif.install @@ -6,6 +6,8 @@ post_install() { chown -R minbif:minbif /var/lib/minbif chmod 0770 /var/lib/minbif chmod 0770 /var/lib/minbif/users + + systemd-tmpfiles --create minbif.conf } post_upgrade() { diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 5c3cab47f..8e04eb820 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94000 2013-07-12 22:37:49Z faidoc $ +# $Id: PKGBUILD 95581 2013-08-14 15:07:17Z bgyorgy $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo pkgver=1.8.4 -pkgrel=1 +pkgrel=3 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" @@ -48,4 +48,15 @@ package() { cd linuxmint-nemo-* make DESTDIR="$pkgdir/" install + + # Rename 'Files' app name to avoid having the same as nautilus + sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' "$pkgdir/usr/share/applications/nemo.desktop" + + # Autostart only in Cinnamon to avoid conflict with GNOME Classic session + cp "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" \ + "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop" + sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon/' \ + "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" + sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon2d/' \ + "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop" } diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD index b03f4e1dd..1826118d3 100644 --- a/community/redshift/PKGBUILD +++ b/community/redshift/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92311 2013-06-03 21:26:54Z lfleischer $ +# $Id: PKGBUILD 95564 2013-08-14 09:35:51Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Geoffrey Teale <tealeg@stop-squark> # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com> @@ -6,14 +6,14 @@ pkgname=redshift pkgver=1.7 -pkgrel=6 +pkgrel=7 pkgdesc='Adjusts the color temperature of your screen according to your surroundings.' arch=('i686' 'x86_64') url='http://jonls.dk/redshift/' license=('GPL3') depends=('gconf' 'geoclue' 'libxxf86vm') optdepends=('pygtk: for gtk-redshift' - 'pyxdg: for gtk-redshift' + 'python2-xdg: for gtk-redshift' 'librsvg: for gtk-redshift') makedepends=('python2') install='redshift.install' diff --git a/community/smtube/PKGBUILD b/community/smtube/PKGBUILD index 75e841a48..6fe793d98 100644 --- a/community/smtube/PKGBUILD +++ b/community/smtube/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93959 2013-07-12 01:36:36Z speps $ +# $Id: PKGBUILD 95598 2013-08-14 21:47:33Z speps $ # Maintainer : speps <speps at aur dot archlinux dot org> # Contributor: Andreas Schnaiter <rc.poison@gmail.com> pkgname=smtube -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc="A small youtube browser" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('mplayer: play videos with MPlayer' 'vlc: play videos with VLC') install="$pkgname.install" source=("http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2") -md5sums=('d9a954e1b337f0c850dcfc6063255056') +md5sums=('b80d4d085a8e7350619d65f0f0786037') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/synce-core/PKGBUILD b/community/synce-core/PKGBUILD new file mode 100644 index 000000000..77b484699 --- /dev/null +++ b/community/synce-core/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 95579 2013-08-14 14:20:51Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jan Was <janek.jan@gmail.com> + +pkgname=synce-core +pkgver=0.17 +pkgrel=1 +pkgdesc="provide a means of communication with a Windows CE device - libraries" +arch=('i686' 'x86_64') +url="http://synce.sourceforge.net/" +license=('GPL') +depends=('dbus-glib' 'udev' 'python2') +makedepends=('dhclient') +provides=('synce-libsynce' 'synce-librapi') +replaces=('synce-libsynce' 'synce-librapi') +conflicts=('synce-libsynce' 'synce-librapi') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/synce/SynCE/synce-core/synce-core-$pkgver.tar.gz) +md5sums=('ee0b9369b6fea5e2d1b970503dd7cb0e') + +build() { + cd $srcdir/$pkgname-$pkgver + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/synce-core \ + --enable-odccm-support --enable-udev-support --enable-bluetooth-support + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community/synce-librapi/PKGBUILD b/community/synce-librapi/PKGBUILD deleted file mode 100644 index 9c28b5439..000000000 --- a/community/synce-librapi/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 65489 2012-02-21 06:06:56Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Zhukov Pavel <gelios@gmail.com> - -pkgname=synce-librapi -pkgver=0.15.2 -pkgrel=3 -pkgdesc="provide a means of communication with a Windows CE device - libraries and tools for making remote calls to pocket pc" -arch=('i686' 'x86_64') -url="http://synce.sourceforge.net/" -license=('GPL') -depends=('synce-libsynce') -makedepends=('pyrex') -source=(http://downloads.sourceforge.net/sourceforge/synce/librapi2-$pkgver.tar.gz) -md5sums=('0a15bc22ee02794ca4714799611b4746') - -build() { - cd $srcdir/librapi2-$pkgver - export PYTHON=/usr/bin/python2 - LDFLAGS=-lsynce ./configure --prefix=/usr --enable-udev-support --disable-hal-support - make - make DESTDIR=$pkgdir install -} diff --git a/community/synce-libsynce/PKGBUILD b/community/synce-libsynce/PKGBUILD deleted file mode 100644 index 5cd330c7e..000000000 --- a/community/synce-libsynce/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 65475 2012-02-21 05:59:42Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Zhukov Pavel <gelios@gmail.com> - -pkgname=synce-libsynce -pkgver=0.15.1 -pkgrel=3 -pkgdesc="provide a means of communication with a Windows CE device - libraries" -arch=('i686' 'x86_64') -url="http://synce.sourceforge.net/" -license=('GPL') -depends=('dbus-glib') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/synce/libsynce-$pkgver.tar.gz) -md5sums=('eaddc88c5f0027e89c6f0fffec34def2') - -build() { - cd $srcdir/libsynce-$pkgver - ./configure --prefix=/usr --enable-odccm-support --enable-udev-support --disable-hal-support - make -} - -package() { - cd $srcdir/libsynce-$pkgver - make DESTDIR=$pkgdir install -} |
