sergiomb pushed to gdesklets (f21). "Merge branch 'master' into f21"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Jun 11 01:30:59 UTC 2015
From 38c81870288ff830ec5f198c12db0a072ea388a1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 27 Sep 2014 10:47:21 -0500
Subject: update mimeinfo scriptlets
diff --git a/gdesklets.spec b/gdesklets.spec
index 72ff9dc..c28c432 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -2,7 +2,7 @@
Name: gdesklets
Version: 0.36.3
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Architecture for desktop applets
Group: User Interface/Desktops
@@ -22,8 +22,6 @@ BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, gvfs-devel
BuildRequires: libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
BuildRequires: libgnome-devel > 2.6.0, desktop-file-utils, libcap-devel
Requires: gnome-python2-gconf >= 2.6.0
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
%description
@@ -73,10 +71,15 @@ rm -f %{buildroot}%{_datadir}/mime/{globs2,generic-icons,icons,treemagic,types}
%post
-update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%postun
+if [ $1 -eq 0 ] ; then
update-mime-database %{_datadir}/mime &> /dev/null || :
+fi
+
+%posttrans
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%clean
@@ -97,6 +100,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Sep 27 2014 Rex Dieter <rdieter at fedoraproject.org> 0.36.3-17
+- update mimeinfo scriptlets
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.3-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
cgit v0.10.2
From d807e9809637e8b506fc193d98d1f66cce663192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio at serjux.com>
Date: Tue, 9 Jun 2015 02:42:04 +0100
Subject: Add 8 patches from upstream.
- Remove gdesklets-aarch64.patch and use autoreconf instead.
diff --git a/174_173.diff b/174_173.diff
new file mode 100644
index 0000000..1de6b4a
--- /dev/null
+++ b/174_173.diff
@@ -0,0 +1,21 @@
+=== modified file 'Makefile_gdesklets.am'
+--- Makefile_gdesklets.am 2011-01-06 11:01:06 +0000
++++ Makefile_gdesklets.am 2011-01-30 13:13:56 +0000
+@@ -34,14 +34,14 @@
+
+ # The .desktop file
+ desktop_in_files = data/gdesklets.desktop.in
+-dist_desktop_DATA= $(desktop_in_files)
++dist_noinst_desktop_DATA= $(desktop_in_files)
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+
+ # The shared mime XML file
+ sharedmimepackage_in_files = data/gdesklets.xml.in
+-dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
++dist_noinst_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
+ sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+
+
diff --git a/175_174.diff b/175_174.diff
new file mode 100644
index 0000000..50184c2
--- /dev/null
+++ b/175_174.diff
@@ -0,0 +1,41 @@
+=== modified file 'Makefile_gdesklets.am'
+--- Makefile_gdesklets.am 2011-01-30 13:13:56 +0000
++++ Makefile_gdesklets.am 2011-01-30 20:21:36 +0000
+@@ -20,28 +20,31 @@
+
+ dist_man_MANS = doc/man/gdesklets.1
+
++# The .desktop file
++desktop_in_files = data/gdesklets.desktop.in
++# The shared mime XML file
++sharedmimepackage_in_files = data/gdesklets.xml.in
++
+ EXTRA_DIST = \
+ AUTHORS \
+ COPYING \
+ README \
+ TODO \
+ NEWS \
+- contrib/bash/gdesklets
++ contrib/bash/gdesklets \
++ $(desktop_in_files) \
++ $(sharedmimepackage_in_files)
+
+ # See http://www.gnu.org/software/hello/manual/automake/Clean.html
+ CLEANFILES = \
+ po/.intltool-merge-cache
+
+ # The .desktop file
+-desktop_in_files = data/gdesklets.desktop.in
+-dist_noinst_desktop_DATA= $(desktop_in_files)
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+
+ # The shared mime XML file
+-sharedmimepackage_in_files = data/gdesklets.xml.in
+-dist_noinst_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
+ sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+
+
diff --git a/176_175.diff b/176_175.diff
new file mode 100644
index 0000000..8d2d1c9
--- /dev/null
+++ b/176_175.diff
@@ -0,0 +1,137 @@
+=== modified file 'Makefile.am'
+--- Makefile.am 2010-12-14 10:24:59 +0000
++++ Makefile.am 2011-01-31 01:20:58 +0000
+@@ -11,8 +11,12 @@
+ autostartdir = $(sysconfdir)/xdg/autostart
+ sharedmimepackagedir = $(datadir)/mime/packages
+ mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
++pixmapdir = $(datadir)/pixmaps
+ basicdeskletsdir = ${installdir}
+
++# initialize this so we can add to it later
++nobase_dist_install_DATA =
++
+ include Makefile_gdesklets.am
+ include Makefile_python.am
+ include Makefile_basicdesklets.am
+=== modified file 'Makefile_gdesklets.am'
+--- Makefile_gdesklets.am 2011-01-30 20:21:36 +0000
++++ Makefile_gdesklets.am 2011-01-31 01:20:58 +0000
+@@ -1,12 +1,14 @@
+ # Set the LDFLAGS for this section
+ AM_LDFLAGS = -module -avoid-version -as-needed
+
++# Libraries that get installed in these exact subdirectories
+ nobase_install_LTLIBRARIES = \
+ libdesklets/system/gtop.la \
+ utils/svg.la \
+ utils/tiling.la \
+ utils/x11.la
+
++# Scripts that get distributed and installed
+ dist_install_SCRIPTS = \
+ ctrlinfo \
+ gdesklets \
+@@ -16,8 +18,10 @@
+ gdesklets-shell \
+ test-control.py
+
++# "System" scripts that get distributed but not installed
+ dist_noinst_SCRIPTS = autogen.sh
+
++# Man page
+ dist_man_MANS = doc/man/gdesklets.1
+
+ # The .desktop file
+@@ -25,16 +29,34 @@
+ # The shared mime XML file
+ sharedmimepackage_in_files = data/gdesklets.xml.in
+
+-EXTRA_DIST = \
+- AUTHORS \
+- COPYING \
+- README \
+- TODO \
+- NEWS \
+- contrib/bash/gdesklets \
+- $(desktop_in_files) \
++# Other odds and ends that get distributed, but not installed
++# It's up to distro package maintainers to install these
++EXTRA_DIST = \
++ AUTHORS \
++ COPYING \
++ README \
++ TODO \
++ NEWS \
++ contrib/bash/gdesklets \
++ $(desktop_in_files) \
+ $(sharedmimepackage_in_files)
+
++# Docs and images that get distributed and installed to these specific
++# directories
++nobase_dist_install_DATA += \
++ doc/basic/gdesklets-doc.xml \
++ doc/basic/Images/desklet-context-menu.png \
++ doc/basic/Images/desklet-start-shell.png \
++ doc/basic/Images/gdesklets.png \
++ doc/basic/Images/open-command.png \
++ doc/basic/Images/preferences.png \
++ doc/basic/Images/profile.png \
++ doc/basic/Images/remote.png \
++ doc/basic/Images/shell.png \
++ data/about.png \
++ data/gdesklets.png
++
++# Additional files that get cleaned by distclean
+ # See http://www.gnu.org/software/hello/manual/automake/Clean.html
+ CLEANFILES = \
+ po/.intltool-merge-cache
+@@ -49,8 +71,9 @@
+ @INTLTOOL_XML_RULE@
+
+ # And the mime icon
+-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
++dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
+
++# Note, this gets installed in both $(pixmapdir) and $(installdir)
+ pixmap_DATA = data/gdesklets.png
+
+ libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \
+
+=== modified file 'Makefile_python.am'
+--- Makefile_python.am 2010-12-14 10:24:59 +0000
++++ Makefile_python.am 2011-01-31 01:20:58 +0000
+@@ -1,4 +1,4 @@
+-nobase_dist_install_DATA = \
++nobase_dist_install_DATA += \
+ Controls/__init__.py \
+ Controls/ArrayBuffer/__init__.py \
+ Controls/ArrayBuffer/IArrayBuffer.py \
+@@ -48,21 +48,6 @@
+ config/DisplayConfigger.py \
+ config/StateSaver.py \
+ config/settings.py \
+- data/about.png \
+- data/calendar.png \
+- data/gdesklets.desktop \
+- data/gdesklets.png \
+- data/gdesklets.xml \
+- data/gnome-mime-application-x-gdesklets-display.png \
+- doc/basic/gdesklets-doc.xml \
+- doc/basic/Images/desklet-context-menu.png \
+- doc/basic/Images/desklet-start-shell.png \
+- doc/basic/Images/gdesklets.png \
+- doc/basic/Images/open-command.png \
+- doc/basic/Images/preferences.png \
+- doc/basic/Images/profile.png \
+- doc/basic/Images/remote.png \
+- doc/basic/Images/shell.png \
+ display/__init__.py \
+ display/ContainerTarget.py \
+ display/DataTarget.py \
+@@ -212,4 +197,3 @@
+ utils/typeconverter.py \
+ utils/vfs.py \
+ utils/xdr.py
+-
+
diff --git a/177_176.diff b/177_176.diff
new file mode 100644
index 0000000..70ada4f
--- /dev/null
+++ b/177_176.diff
@@ -0,0 +1,10 @@
+=== modified file 'data/gdesklets.desktop.in'
+--- data/gdesklets.desktop.in 2010-06-07 00:48:32 +0000
++++ data/gdesklets.desktop.in 2011-02-03 01:07:57 +0000
+@@ -10,4 +10,5 @@
+ Terminal=false
+ Icon=gdesklets
+ _GenericName=Desktop Widgets
++_X-GNOME-FullName=gDesklets Desktop Widgets
+ _Comment=Eye candy for your desktop
+
diff --git a/179_178.diff b/179_178.diff
new file mode 100644
index 0000000..4be4846
--- /dev/null
+++ b/179_178.diff
@@ -0,0 +1,37 @@
+=== modified file 'configure.ac'
+--- configure.ac 2011-02-15 10:13:11 +0000
++++ configure.ac 2011-04-08 12:17:30 +0000
+@@ -9,6 +9,7 @@
+ AC_CONFIG_MACRO_DIR([macros])
+ AC_CONFIG_FILES([Makefile])
+ AM_MAINTAINER_MODE
++: ${CFLAGS="-Os -g"}
+
+ dnl Required programs
+ AC_PROG_CC
+@@ -21,14 +22,12 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+
+-CFLAGS="-Os -g"
+-
+ AC_ARG_ENABLE(debug,AS_HELP_STRING([--enable-debug],[Maximum debugging]),
+ set_debug="$enableval",[set_debug=no])
+ AC_MSG_CHECKING(for more debugging including macro expansion)
+ if test "$GCC" = "yes" -a "$set_debug" != "no"; then
+ AC_MSG_RESULT(yes)
+- CFLAGS="-O0 -g3"
++ CFLAGS="$CFLAGS -O0 -g3"
+ else
+ AC_MSG_RESULT(no)
+ fi
+@@ -39,7 +38,7 @@
+ AC_MSG_CHECKING(for more warnings, including -Werror)
+ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+ AC_MSG_RESULT(yes)
+- CFLAGS="\
++ CFLAGS="$CFLAGS \
+ -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+ -Wmissing-declarations -Wredundant-decls -Wunreachable-code \
+ -Wpointer-arith -Wcast-align -Wsign-compare -ansi \
+
diff --git a/180_179.diff b/180_179.diff
new file mode 100644
index 0000000..f3121bb
--- /dev/null
+++ b/180_179.diff
@@ -0,0 +1,26 @@
+=== modified file 'display/GlassWindow.py'
+--- display/GlassWindow.py 2007-11-07 17:31:19 +0000
++++ display/GlassWindow.py 2011-05-12 01:20:09 +0000
+@@ -45,6 +45,13 @@
+ self.__layout.put(self.__background, 0, 0)
+
+ self.__on_screen_changed (self, None)
++ # Workaround for Ubuntu >= 11.04
++ # Thanks screenlets
++ # (http://bazaar.launchpad.net/~screenlets-dev/screenlets/trunk/revision/646)
++ try:
++ self.set_property('has-resize-grip', False)
++ except TypeError:
++ pass
+ self.set_app_paintable (True)
+
+ self.__bg_watcher = BGWatcher()
+@@ -125,6 +132,7 @@
+ def __on_expose_event (self, widget, event = None, user_data = None):
+
+ cr = widget.window.cairo_create ()
++ # Fill with fully transparent white
+ cr.set_source_rgba (1.0, 1.0, 1.0, 0.0)
+ cr.set_operator (cairo.OPERATOR_SOURCE)
+ cr.paint ()
+
diff --git a/186_185.diff b/186_185.diff
new file mode 100644
index 0000000..d5c9507
--- /dev/null
+++ b/186_185.diff
@@ -0,0 +1,55 @@
+=== modified file 'scripting/Script.py'
+--- scripting/Script.py 2010-06-20 19:52:22 +0000
++++ scripting/Script.py 2011-11-07 04:12:46 +0000
+@@ -25,8 +25,10 @@
+ # ID of the display
+ self.__dsp_id = dsp_id
+
+- # path of the display
++ # paths of the display
+ self.__dsp_path = dsp_path
++ import os
++ self.__dsp_dir = os.path.dirname(dsp_path) + os.path.sep
+
+ # the state saver
+ self.__state_saver = StateSaver(dsp_id)
+@@ -62,6 +64,10 @@
+ self.__environment["get_config"] = self.__script_get_config
+ self.__environment["get_control"] = self.__script_get_control
+ self.__environment["set_config"] = self.__script_set_config
++ self.__environment["get_desklet_path"] = \
++ self.__script_get_desklet_path
++ self.__environment["sanitize_string"] = \
++ self.__script_sanitize_string
+ self.__environment["launch"] = self.__script_launch
+
+ # see end of file
+@@ -223,6 +229,27 @@
+
+
+ #
++ # Gets the desklet's path
++ #
++ def __script_get_desklet_path(self):
++
++ return self.__dsp_dir
++
++
++ #
++ # Sanitizes a string for the XML environment.
++ #
++ def __script_sanitize_string(self, s):
++
++ sanitized_string = s.replace("&", "&")
++ sanitized_string = sanitized_string.replace("<", "<")
++ sanitized_string = sanitized_string.replace(">", ">")
++ sanitized_string = sanitized_string.replace("\'", "'")
++ sanitized_string = sanitized_string.replace("\"", """)
++
++ return sanitized_string
++
++ #
+ # Launches the given command if it's safe.
+ #
+ def __script_launch(self, command):
+
diff --git a/188_187.diff b/188_187.diff
new file mode 100644
index 0000000..3d26dca
--- /dev/null
+++ b/188_187.diff
@@ -0,0 +1,281 @@
+=== modified file 'config/ConfigList.py'
+--- config/ConfigList.py 2010-12-14 10:24:59 +0000
++++ config/ConfigList.py 2012-03-13 23:27:03 +0000
+@@ -187,12 +187,36 @@
+
+
+ def _setp_items(self, key, items):
+- # set the items property
++
++ # just for convenience we compare the former items
++ # and selection with the new one such that adding/
++ # removing an item to/from the list does not destroy
++ # the complete old selection
++ # Renaming items in the item list however always
++ # unchecks the renamed item
++ old_selection = self.get_prop("value")
++ old_items = self.get_prop("items")
++ new_selection = []
++
++ # doing it this way results in the behavior that if
++ # values in the old_items list appear multiple times
++ # and one of them is selected, all items in the new
++ # item list with the same value are selected duplicates
++ # within the list will be removed in the _setp_value()
++ # method anyway
++ for v, k in items:
++ for ov, ok in old_items:
++ if ok == k:
++ if ok in old_selection:
++ new_selection.append(k)
++
++ # set the items property
+ self._set_items(items)
+- self._set_config(items)
++ # we store values but no item lists
++ #self._set_config(items)
+ self._setp(key, items)
+- # re-set the selection
+- self.set_prop("value", self.get_prop("value"))
++ # re-set the selection according to new selection
++ self.set_prop("value", new_selection)
+
+
+
+@@ -210,7 +234,9 @@
+ else: newheight = h
+ self.__scrolledwindow.set_size_request(-1, newheight)
+ self.__scrolledwindow.resize_children()
+- self._set_selection('value', self._getp('value'))
++
++ # do not update the selection pattern here but in _setp_items()
++ #self._set_selection('value', self._getp('value'))
+
+
+ def _set_selection(self, key, value):
+@@ -222,18 +248,30 @@
+ if str(v) == str(self.__liststore[path][2]):
+ self.__liststore[path][0] = True
+ item = self.__liststore.iter_next(item)
+-
+
+
+ def _setp_value(self, key, value):
++ # remove all selections that do not refer
++ # to any item key currently known
++ tmplist = []
++ for v in value:
++ if v in self.__items_values:
++ tmplist.append(v)
++
++ # remove duplicates from the list
++ tmplist = list(set(tmplist))
++
++ # update the selection according to tmplist
++ self._set_selection(key, tmplist)
++
+ # set the value (selection) property
+- try:
+- index = self.__items_values.index(value)
+- except:
+- index = 0
++ #try:
++ # index = self.__items_values.index(value)
++ #except:
++ # index = 0
+
+- if index:
+- self.__listview.set_cursor(index)
+- self.__listview.scroll_to_cell(index)
++ #if index:
++ # self.__listview.set_cursor(index)
++ # self.__listview.scroll_to_cell(index)
+ self._set_config(value)
+ self._setp(key, value)
+
+=== modified file 'scripting/ControlWrapper.py'
+--- scripting/ControlWrapper.py 2010-10-06 00:52:07 +0000
++++ scripting/ControlWrapper.py 2012-03-13 23:27:03 +0000
+@@ -36,6 +36,9 @@
+
+ # Keep an original copy around for extending the array
+ self.__dict__["_ControlWrapper__original_control"] = Vault(control)
++ # deactivate the original control
++ ctl = self.__dict__["_ControlWrapper__original_control"](open)
++ ctl.stop()
+ # Create a property handler for each deep copy of control
+ self.__dict__["_ControlWrapper__properties"] = \
+ [ PropertyInterface(self.__control(open)[i])
+@@ -50,7 +53,6 @@
+ Vault( tuple(ids + taz_ids) )
+
+
+-
+ def __len__(self):
+
+ return self.__length
+@@ -63,33 +65,36 @@
+
+ if name == "length":
+ # A little bounds checking
+- if value <= 0:
+- log(_("Warning: Value of property \"length\" must be greater than 0 (setting to 1)"))
+- value = 1
++ size = value
++ if value < 0:
++ value = 0
++ log(_("Warning: Value of property \"length\" must be greater than or equal to 0 (setting to 0)"))
++ if value == 0:
++ log(_("Warning: Value of property \"length\" set to 0 disables list mode"))
++ size = 1
+
+ # Don't do anything if value isn't changing
+- if value != self.__length:
+- if value > self.__length:
++ if size != self.__length:
++ if size > self.__length:
+ # Append new copies of the control
+ self.__dict__["_ControlWrapper__control"] = \
+ Vault( self.__control(open) + \
+ [ deepcopy(self.__original_control(open)) \
+- for i in range(self.__length, value) ] )
++ for i in range(self.__length, size) ] )
+ # Initialize all new copies of the control
+ for ctl in [ self.__dict__["_ControlWrapper__control"](open)[i] \
+- for i in range(self.__length, value) ]:
++ for i in range(self.__length, size) ]:
+ ctl.__init__()
+ # Append new PropertyInterface instances
+ self.__dict__["_ControlWrapper__properties"] = \
+ self.__properties + \
+ [ PropertyInterface(self.__control(open)[i]) \
+- for i in range(self.__length, value) ]
+- elif value < self.__length:
++ for i in range(self.__length, size) ]
++ elif size < self.__length:
+ # We want to leave the "0th" item alone, which is
+ # handled by the above conditionals
+- start_deleting_at = value #if value != 0 else 1
+- for i in range(start_deleting_at, self.__length):
+- del self[i]
++ for i in range(size, self.__length):
++ del self[size]
+
+ self.__dict__["_ControlWrapper__length"] = value
+ else: # name != "length"
+@@ -171,6 +176,7 @@
+ # no property that uses that Control
+ del self.__dict__["_ControlWrapper__properties"][idx]
+ new_ctrl_list = self.__dict__["_ControlWrapper__control"](open)
++ new_ctrl_list[idx].stop()
+ del new_ctrl_list[idx]
+ #del self.__dict__["_ControlWrapper__control"]
+ self.__dict__["_ControlWrapper__control"] = Vault( new_ctrl_list )
+@@ -184,6 +190,21 @@
+
+ log(_("Warning: Control not initialized as an array in Desklet; not deleting anything."))
+
++ def stop(self):
++
++ for c in self.__dict__["_ControlWrapper__control"](open):
++ try:
++ c.stop()
++ except StandardError, exc:
++ import traceback; traceback.print_exc()
++ log("Could not stop control %s" % c)
++ del c
++
++ # original control is already stopped
++ c = self.__dict__["_ControlWrapper__original_control"](open)
++ del c
++
++
+
+
+ def get_interfaces_id(self):
+
+=== modified file 'scripting/Script.py'
+--- scripting/Script.py 2011-11-07 04:12:46 +0000
++++ scripting/Script.py 2012-03-13 23:27:03 +0000
+@@ -37,8 +37,12 @@
+ self.__environment = {}
+
+ # the list of loaded controls
++ # (deprecated since we create lists of wrapped controls)
+ self.__loaded_controls = []
+
++ # the list of created control wrappers
++ self.__control_wrappers = []
++
+ # flag indicating whether the display has been stopped
+ self.__is_stopped = False
+
+@@ -212,8 +216,11 @@
+ factory = ControlFactory()
+ ctrl = factory.get_control(interface)
+ if (ctrl):
+- self.__loaded_controls.append(ctrl)
++ #self.__loaded_controls.append(ctrl)
++ # created a list of wrapped controls from the template
+ wrapped = ControlWrapper(ctrl, size)
++ # remember the control wrapper for cleanup on stop()
++ self.__control_wrappers.append(wrapped)
+ return wrapped
+
+ raise UserError(_("No Control could be found for interface %s") % \
+@@ -304,13 +311,25 @@
+
+ self.__is_stopped = True
+ del self.__environment
++
++ # delete all wrapped controls
++ for w in self.__control_wrappers:
++ try:
++ w.stop()
++ except StandardError, exc:
++ import traceback; traceback.print_exc()
++ log("Could not stop control wrapper %s" % w)
++ del w
++ del self.__control_wrappers
++
++ # delete other controls
+ for c in self.__loaded_controls:
+ try:
+ c.stop()
+ except StandardError, exc:
+ import traceback; traceback.print_exc()
+ log("Could not stop control %s" % c)
+- del c
++ del c
+ del self.__loaded_controls
+
+
+
+=== modified file 'utils/Element.py'
+--- utils/Element.py 2010-06-20 19:52:22 +0000
++++ utils/Element.py 2012-03-13 23:27:03 +0000
+@@ -14,7 +14,7 @@
+
+ and can be read with
+
+- get_prop(key, value)
++ get_prop(key)
+
+
+ If you don't need any special setter or getter methods, then you can use
+
+=== modified file 'utils/render.c'
+--- utils/render.c 2010-05-24 10:59:53 +0000
++++ utils/render.c 2012-03-13 23:27:03 +0000
+@@ -89,7 +89,10 @@
+ /* set image */
+ gtk_image_set_from_pixbuf (image, scaled);
+
++// this condition is causing a memory leak since rev. 142
++/*
+ if (srcwidth != width || srcheight != height)
++*/
+ g_object_unref (scaled);
+ }
+
+
diff --git a/gdesklets-aarch64.patch b/gdesklets-aarch64.patch
deleted file mode 100644
index 8668b99..0000000
--- a/gdesklets-aarch64.patch
+++ /dev/null
@@ -1,1283 +0,0 @@
-diff -urN gdesklets-0.36.3/config.guess gdesklets-0.36.3-aarch64/config.guess
---- gdesklets-0.36.3/config.guess 2011-01-23 13:56:08.000000000 -0600
-+++ gdesklets-0.36.3-aarch64/config.guess 2013-03-03 04:57:13.771899628 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012 Free Software Foundation, Inc.
-
--timestamp='2009-12-30'
-+timestamp='2012-09-25'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,9 +17,7 @@
- # 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., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -57,8 +55,8 @@
-
- Originally written by Per Bothner.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
--Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-+Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -140,35 +138,12 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
--case "${UNAME_SYSTEM}" in
--Linux|GNU/*)
-- eval $set_cc_for_build
-- cat <<-EOF > $dummy.c
-- #include <features.h>
-- #ifdef __UCLIBC__
-- # ifdef __UCLIBC_CONFIG_VERSION__
-- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-- # else
-- LIBC=uclibc
-- # endif
-- #else
-- # ifdef __dietlibc__
-- LIBC=dietlibc
-- # else
-- LIBC=gnu
-- # endif
-- #endif
-- EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-- ;;
--esac
--
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
-- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
-@@ -204,7 +179,7 @@
- fi
- ;;
- *)
-- os=netbsd
-+ os=netbsd
- ;;
- esac
- # The OS release
-@@ -225,6 +200,10 @@
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
-+ *:Bitrig:*:*)
-+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+ exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -247,7 +226,7 @@
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
-- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -293,7 +272,10 @@
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- exit ;;
-+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+ exitcode=$?
-+ trap '' 0
-+ exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
-@@ -319,12 +301,12 @@
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
-- echo powerpc-ibm-os400
-+ echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
-- arm:riscos:*:*|arm:RISCOS:*:*)
-+ arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -418,23 +400,23 @@
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-- echo m68k-milan-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-- echo m68k-hades-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-- echo m68k-unknown-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
-@@ -504,8 +486,8 @@
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
-- # DG/UX returns AViiON for all architectures
-- UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -518,7 +500,7 @@
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
-@@ -575,7 +557,7 @@
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[456])
-+ *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -618,52 +600,52 @@
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-- case "${sc_cpu_version}" in
-- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-- 532) # CPU_PA_RISC2_0
-- case "${sc_kernel_bits}" in
-- 32) HP_ARCH="hppa2.0n" ;;
-- 64) HP_ARCH="hppa2.0w" ;;
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-- esac ;;
-- esac
-+ esac ;;
-+ esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-
-- #define _HPUX_SOURCE
-- #include <stdlib.h>
-- #include <unistd.h>
--
-- int main ()
-- {
-- #if defined(_SC_KERNEL_BITS)
-- long bits = sysconf(_SC_KERNEL_BITS);
-- #endif
-- long cpu = sysconf (_SC_CPU_VERSION);
--
-- switch (cpu)
-- {
-- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-- case CPU_PA_RISC2_0:
-- #if defined(_SC_KERNEL_BITS)
-- switch (bits)
-- {
-- case 64: puts ("hppa2.0w"); break;
-- case 32: puts ("hppa2.0n"); break;
-- default: puts ("hppa2.0"); break;
-- } break;
-- #else /* !defined(_SC_KERNEL_BITS) */
-- puts ("hppa2.0"); break;
-- #endif
-- default: puts ("hppa1.0"); break;
-- }
-- exit (0);
-- }
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
- EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -754,22 +736,22 @@
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
-- exit ;;
-+ exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit ;;
-+ exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
-- exit ;;
-+ exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
-- exit ;;
-+ exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
-- exit ;;
-+ exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
-@@ -793,14 +775,14 @@
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-- exit ;;
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit ;;
- 5000:UNIX_System_V:4.*:*)
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -812,30 +794,35 @@
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
-- case ${UNAME_MACHINE} in
-- pc98)
-- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ case ${UNAME_PROCESSOR} in
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-+ *:MINGW64*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw64
-+ exit ;;
- *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
-+ i*:MSYS*:*)
-+ echo ${UNAME_MACHINE}-pc-msys
-+ exit ;;
- i*:windows32*:*)
-- # uname -m includes "-pc" on this system.
-- echo ${UNAME_MACHINE}-mingw32
-+ # uname -m includes "-pc" on this system.
-+ echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
- *:Interix*:*)
-- case ${UNAME_MACHINE} in
-+ case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-@@ -872,15 +859,22 @@
- exit ;;
- *:GNU:*:*)
- # the GNU system
-- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
-- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
-+ aarch64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ aarch64_be:Linux:*:*)
-+ UNAME_MACHINE=aarch64_be
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
-@@ -890,44 +884,61 @@
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
-- esac
-+ esac
- objdump --private-headers /bin/sh | grep -q ld.so.1
-- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
- arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_PCS_VFP
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+ fi
- fi
- exit ;;
- avr32*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- cris:Linux:*:*)
-- echo cris-axis-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
-- echo crisv32-axis-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
-- echo frv-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ hexagon:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:Linux:*:*)
-- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-+ LIBC=gnu
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit ;;
- ia64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m32r*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- m68*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
-@@ -946,51 +957,54 @@
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-- echo or32-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- padre:Linux:*:*)
-- echo sparc-unknown-linux-${LIBC}
-+ echo sparc-unknown-linux-gnu
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-${LIBC}
-+ echo hppa64-unknown-linux-gnu
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-- PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-- PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-- *) echo hppa-unknown-linux-${LIBC} ;;
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-${LIBC}
-+ echo powerpc64-unknown-linux-gnu
- exit ;;
- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-${LIBC}
-+ echo powerpc-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ tile*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- vax:Linux:*:*)
-- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
-- echo x86_64-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- xtensa*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -999,11 +1013,11 @@
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
-- # Unixware is an offshoot of SVR4, but it has its own version
-- # number series starting with 2...
-- # I am not positive that other SVR4 systems won't match this,
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
-- # Use sysv4.2uw... so that sysv4* matches it.
-+ # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
-@@ -1035,7 +1049,7 @@
- fi
- exit ;;
- i*86:*:5:[678]*)
-- # UnixWare 7.x, OpenUNIX and OpenServer 6.
-+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
-@@ -1063,13 +1077,13 @@
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
-- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i586.
-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+ # the processor, so we play safe by assuming i586.
- # Note: whatever this is, it MUST be the same as what config.sub
- # prints for the "djgpp" host, or else GDB configury will decide that
- # this is a cross-build.
- echo i586-pc-msdosdjgpp
-- exit ;;
-+ exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
-@@ -1104,8 +1118,8 @@
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && { echo i486-ncr-sysv4; exit; } ;;
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4; exit; } ;;
- NCR*:*:4.2:* | MPRAS*:*:4.2:*)
- OS_REL='.3'
- test -r /etc/.relid \
-@@ -1148,10 +1162,10 @@
- echo ns32k-sni-sysv
- fi
- exit ;;
-- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says <Richard.M.Bartel at ccMail.Census.GOV>
-- echo i586-unisys-sysv4
-- exit ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel at ccMail.Census.GOV>
-+ echo i586-unisys-sysv4
-+ exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes <hewes at openmarket.com>.
- # How about differentiating between stratus architectures? -djm
-@@ -1177,11 +1191,11 @@
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
-- echo mips-nec-sysv${UNAME_RELEASE}
-+ echo mips-nec-sysv${UNAME_RELEASE}
- else
-- echo mips-unknown-sysv${UNAME_RELEASE}
-+ echo mips-unknown-sysv${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
-@@ -1194,6 +1208,9 @@
- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
- echo i586-pc-haiku
- exit ;;
-+ x86_64:Haiku:*:*)
-+ echo x86_64-unknown-haiku
-+ exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
-@@ -1246,7 +1263,10 @@
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
-- NSE-?:NONSTOP_KERNEL:*:*)
-+ NEO-?:NONSTOP_KERNEL:*:*)
-+ echo neo-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
-+ NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1291,13 +1311,13 @@
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
-- echo mips-sei-seiux${UNAME_RELEASE}
-+ echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
-- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
-@@ -1315,11 +1335,11 @@
- i*86:AROS:*:*)
- echo ${UNAME_MACHINE}-pc-aros
- exit ;;
-+ x86_64:VMkernel:*:*)
-+ echo ${UNAME_MACHINE}-unknown-esx
-+ exit ;;
- esac
-
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
- eval $set_cc_for_build
- cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
-@@ -1337,11 +1357,11 @@
- #include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
- #ifdef NEWSOS4
-- "4"
-+ "4"
- #else
-- ""
-+ ""
- #endif
-- ); exit (0);
-+ ); exit (0);
- #endif
- #endif
-
-diff -urN gdesklets-0.36.3/config.sub gdesklets-0.36.3-aarch64/config.sub
---- gdesklets-0.36.3/config.sub 2011-01-23 13:56:08.000000000 -0600
-+++ gdesklets-0.36.3-aarch64/config.sub 2013-03-03 04:57:13.812894887 -0600
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012 Free Software Foundation, Inc.
-
--timestamp='2010-01-22'
-+timestamp='2012-10-10'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,9 +21,7 @@
- # 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., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -76,8 +74,8 @@
- GNU config.sub ($timestamp)
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
--Software Foundation, Inc.
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-+Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -124,13 +122,18 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-+ knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
-+ android-linux)
-+ os=-linux-android
-+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-+ ;;
- *)
- basic_machine=`echo $1 | sed 's/-[^-]*$//'`
- if [ $basic_machine != $1 ]
-@@ -153,12 +156,12 @@
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple | -axis | -knuth | -cray | -microblaze)
-+ -apple | -axis | -knuth | -cray | -microblaze*)
- os=
- basic_machine=$1
- ;;
-- -bluegene*)
-- os=-cnk
-+ -bluegene*)
-+ os=-cnk
- ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
-@@ -174,10 +177,10 @@
- os=-chorusos
- basic_machine=$1
- ;;
-- -chorusrdb)
-- os=-chorusrdb
-+ -chorusrdb)
-+ os=-chorusrdb
- basic_machine=$1
-- ;;
-+ ;;
- -hiux*)
- os=-hiuxwe2
- ;;
-@@ -222,6 +225,12 @@
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -lynx*178)
-+ os=-lynxos178
-+ ;;
-+ -lynx*5)
-+ os=-lynxos5
-+ ;;
- -lynx*)
- os=-lynxos
- ;;
-@@ -246,20 +255,25 @@
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
-+ | aarch64 | aarch64_be \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+ | be32 | be64 \
- | bfin \
- | c4x | clipper \
-- | d10v | d30v | dlx | dsp16xx | dvp \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | epiphany \
- | fido | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore | mep | metag \
-+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-@@ -282,29 +296,39 @@
- | moxie \
- | mt \
- | msp430 \
-+ | nds32 | nds32le | nds32be \
- | nios | nios2 \
- | ns16k | ns32k \
-+ | open8 \
- | or32 \
- | pdp10 | pdp11 | pj | pjl \
-- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
-- | rx \
-+ | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-- | spu | strongarm \
-- | tahoe | thumb | tic4x | tic80 | tron \
-+ | spu \
-+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
-- | v850 | v850e \
-+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | we32k \
-- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ | x86 | xc16x | xstormy16 | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-- # Motorola 68HC11/12.
-+ c54x)
-+ basic_machine=tic54x-unknown
-+ ;;
-+ c55x)
-+ basic_machine=tic55x-unknown
-+ ;;
-+ c6x)
-+ basic_machine=tic6x-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
-@@ -314,6 +338,21 @@
- basic_machine=mt-unknown
- ;;
-
-+ strongarm | thumb | xscale)
-+ basic_machine=arm-unknown
-+ ;;
-+ xgate)
-+ basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ xscaleeb)
-+ basic_machine=armeb-unknown
-+ ;;
-+
-+ xscaleel)
-+ basic_machine=armel-unknown
-+ ;;
-+
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
-@@ -328,25 +367,30 @@
- # Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
-+ | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
-+ | be32-* | be64-* \
- | bfin-* | bs2000-* \
-- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+ | microblaze-* | microblazeel-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-@@ -368,26 +412,29 @@
- | mmix-* \
- | mt-* \
- | msp430-* \
-+ | nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
-+ | open8-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
- | pyramid-* \
-- | romp-* | rs6000-* | rx-* \
-+ | rl78-* | romp-* | rs6000-* | rx-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
-- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-- | tahoe-* | thumb-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-+ | tahoe-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-- | tile-* | tilegx-* \
-+ | tile*-* \
- | tron-* \
- | ubicom32-* \
-- | v850-* | v850e-* | vax-* \
-+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-+ | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | x86-* | x86_64-* | xc16x-* | xps100-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
- | z8k-* | z80-*)
-@@ -412,7 +459,7 @@
- basic_machine=a29k-amd
- os=-udi
- ;;
-- abacus)
-+ abacus)
- basic_machine=abacus-unknown
- ;;
- adobe68k)
-@@ -482,11 +529,20 @@
- basic_machine=powerpc-ibm
- os=-cnk
- ;;
-+ c54x-*)
-+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ c55x-*)
-+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ c6x-*)
-+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
-- cegcc)
-+ cegcc)
- basic_machine=arm-unknown
- os=-cegcc
- ;;
-@@ -518,7 +574,7 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16)
-+ cr16 | cr16-*)
- basic_machine=cr16-unknown
- os=-elf
- ;;
-@@ -676,7 +732,6 @@
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- ;;
--# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
-@@ -734,9 +789,13 @@
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-- microblaze)
-+ microblaze*)
- basic_machine=microblaze-xilinx
- ;;
-+ mingw64)
-+ basic_machine=x86_64-pc
-+ os=-mingw64
-+ ;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
-@@ -752,24 +811,6 @@
- basic_machine=m68k-atari
- os=-mint
- ;;
-- mipsEE* | ee | ps2)
-- basic_machine=mips64r5900el-scei
-- case $os in
-- -linux*)
-- ;;
-- *)
-- os=-elf
-- ;;
-- esac
-- ;;
-- iop)
-- basic_machine=mipsel-scei
-- os=-irx
-- ;;
-- dvp)
-- basic_machine=dvp-scei
-- os=-elf
-- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
-@@ -791,10 +832,18 @@
- ms1-*)
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
-+ msys)
-+ basic_machine=i386-pc
-+ os=-msys
-+ ;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
-+ nacl)
-+ basic_machine=le32-unknown
-+ os=-nacl
-+ ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
-@@ -859,6 +908,12 @@
- np1)
- basic_machine=np1-gould
- ;;
-+ neo-tandem)
-+ basic_machine=neo-tandem
-+ ;;
-+ nse-tandem)
-+ basic_machine=nse-tandem
-+ ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
-@@ -941,9 +996,10 @@
- ;;
- power) basic_machine=power-ibm
- ;;
-- ppc) basic_machine=powerpc-unknown
-+ ppc | ppcbe) basic_machine=powerpc-unknown
- ;;
-- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ppc-* | ppcbe-*)
-+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
-@@ -1037,6 +1093,9 @@
- basic_machine=i860-stratus
- os=-sysv4
- ;;
-+ strongarm-* | thumb-*)
-+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- sun2)
- basic_machine=m68000-sun
- ;;
-@@ -1093,25 +1152,8 @@
- basic_machine=t90-cray
- os=-unicos
- ;;
-- tic54x | c54x*)
-- basic_machine=tic54x-unknown
-- os=-coff
-- ;;
-- tic55x | c55x*)
-- basic_machine=tic55x-unknown
-- os=-coff
-- ;;
-- tic6x | c6x*)
-- basic_machine=tic6x-unknown
-- os=-coff
-- ;;
-- # This must be matched before tile*.
-- tilegx*)
-- basic_machine=tilegx-unknown
-- os=-linux-gnu
-- ;;
- tile*)
-- basic_machine=tile-unknown
-+ basic_machine=$basic_machine-unknown
- os=-linux-gnu
- ;;
- tx39)
-@@ -1181,6 +1223,9 @@
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-+ xscale-* | xscalee[bl]-*)
-+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-+ ;;
- ymp)
- basic_machine=ymp-cray
- os=-unicos
-@@ -1278,11 +1323,11 @@
- if [ x"$os" != x"" ]
- then
- case $os in
-- # First match some system type aliases
-- # that might get confused with valid system types.
-+ # First match some system type aliases
-+ # that might get confused with valid system types.
- # -solaris* is a basic system type, with this one exception.
-- -auroraux)
-- os=-auroraux
-+ -auroraux)
-+ os=-auroraux
- ;;
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
-@@ -1312,18 +1357,19 @@
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-- | -openbsd* | -solidbsd* \
-+ | -bitrig* | -openbsd* | -solidbsd* \
- | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* | -cegcc* \
-- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
-+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-@@ -1366,7 +1412,7 @@
- -opened*)
- os=-openedition
- ;;
-- -os400*)
-+ -os400*)
- os=-os400
- ;;
- -wince*)
-@@ -1415,7 +1461,7 @@
- -sinix*)
- os=-sysv4
- ;;
-- -tpf*)
-+ -tpf*)
- os=-tpf
- ;;
- -triton*)
-@@ -1460,8 +1506,8 @@
- -dicos*)
- os=-dicos
- ;;
-- -nacl*)
-- ;;
-+ -nacl*)
-+ ;;
- -none)
- ;;
- *)
-@@ -1484,10 +1530,10 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-- score-*)
-+ score-*)
- os=-elf
- ;;
-- spu-*)
-+ spu-*)
- os=-elf
- ;;
- *-acorn)
-@@ -1499,8 +1545,20 @@
- arm*-semi)
- os=-aout
- ;;
-- c4x-* | tic4x-*)
-- os=-coff
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ hexagon-*)
-+ os=-elf
-+ ;;
-+ tic54x-*)
-+ os=-coff
-+ ;;
-+ tic55x-*)
-+ os=-coff
-+ ;;
-+ tic6x-*)
-+ os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
-@@ -1520,14 +1578,11 @@
- ;;
- m68000-sun)
- os=-sunos3
-- # This also exists in the configure program, but was not the
-- # default.
-- # os=-sunos4
- ;;
- m68*-cisco)
- os=-aout
- ;;
-- mep-*)
-+ mep-*)
- os=-elf
- ;;
- mips*-cisco)
-@@ -1554,7 +1609,7 @@
- *-ibm)
- os=-aix
- ;;
-- *-knuth)
-+ *-knuth)
- os=-mmixware
- ;;
- *-wec)
diff --git a/gdesklets-desktop.patch b/gdesklets-desktop.patch
index 1879ea8..d927955 100644
--- a/gdesklets-desktop.patch
+++ b/gdesklets-desktop.patch
@@ -10,19 +10,3 @@ diff -ru rpmbuild/BUILD/gdesklets-0.36.3-orig/data/gdesklets.desktop.in rpmbuild
Categories=Utility;
X-GNOME-Autostart-enabled=true
Exec=gdesklets start
-diff -ru rpmbuild/BUILD/gdesklets-0.36.3-orig/utils/render.c rpmbuild/BUILD/gdesklets-0.36.3/utils/render.c
---- rpmbuild/BUILD/gdesklets-0.36.3-orig/utils/render.c 2010-05-24 03:56:05.000000000 -0700
-+++ rpmbuild/BUILD/gdesklets-0.36.3/utils/render.c 2012-03-06 11:09:11.818001473 -0800
-@@ -89,8 +89,12 @@
- /* set image */
- gtk_image_set_from_pixbuf (image, scaled);
-
-+// this condition is causing a memory leak since rev. 142
-+/*
- if (srcwidth != width || srcheight != height)
-+*/
- g_object_unref (scaled);
-+
- }
-
-
diff --git a/gdesklets.spec b/gdesklets.spec
index c28c432..11aa84a 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -2,25 +2,34 @@
Name: gdesklets
Version: 0.36.3
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Architecture for desktop applets
Group: User Interface/Desktops
License: GPL+
-URL: http://%{name}.de/
-Source0: http://%{name}.de/files/%{name}-%{version}.tar.bz2
+URL: https://launchpad.net/gdesklets
+Source0: https://launchpad.net/gdesklets/0.3x/release-of-%{version}/+download/%{name}-%{version}.tar.bz2
Patch0: transition.patch
Patch1: gdesklets-desktop.patch
Patch2: vfs.patch
-Patch3: gdesklets-aarch64.patch
+#Upstream patches
+Patch10: 174_173.diff
+Patch11: 175_174.diff
+Patch12: 176_175.diff
+Patch13: 177_176.diff
+Patch14: 179_178.diff
+Patch15: 180_179.diff
+Patch16: 186_185.diff
+Patch17: 188_187.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0,
+BuildRequires: python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0
BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, gvfs-devel
BuildRequires: libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
BuildRequires: libgnome-devel > 2.6.0, desktop-file-utils, libcap-devel
+BuildRequires: autoconf automake libtool
Requires: gnome-python2-gconf >= 2.6.0
@@ -35,9 +44,18 @@ bars, weather sensors, news tickers.
%patch0 -p1 -b .transition
%patch1 -p3 -b .gdesklets-desktop
%patch2 -p0 -b .vfs
-%patch3 -p1 -b .gdesklets-aarch64
+
+%patch10 -p0 -b .174
+%patch11 -p0 -b .175
+%patch12 -p0 -b .176
+%patch13 -p0 -b .177
+%patch14 -p0 -b .179
+%patch15 -p0 -b .180
+%patch16 -p0 -b .186
+%patch17 -p0 -b .188
%build
+autoreconf -fiv
%configure \
--disable-static \
--disable-schemas-install
@@ -54,21 +72,11 @@ desktop-file-install \
--delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-
mkdir -p %{buildroot}{%{_bindir},%{_datadir}/%{name}/data/,%{_datadir}/%{name}/Displays/,%{_datadir}/%{name}/Controls/}
# don't want libtool archives
find %{buildroot} -name \*.la | xargs rm
-# don't need .in template files
-rm %{buildroot}%{_datadir}/applications/*.desktop.in
-rm %{buildroot}%{_datadir}/mime/packages/*.xml.in
-
-rm -rf %{buildroot}%{_datadir}/mime/application
-rm -rf %{buildroot}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses,mime.cache}
-rm -f %{buildroot}%{_datadir}/applications/{mimeinfo.cache}
-rm -f %{buildroot}%{_datadir}/mime/{globs2,generic-icons,icons,treemagic,types}
-
%post
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
@@ -91,7 +99,7 @@ rm -rf %{buildroot}
%{_bindir}/%{name}
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
-#%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.png
%{_sysconfdir}/xdg/autostart/%{name}.desktop
%{_datadir}/applications/*.desktop
%{_datadir}/%{name}/
@@ -100,6 +108,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Jun 09 2015 Sérgio Basto <sergio at serjux.com> - 0.36.3-18
+- Add 8 patches from upstream.
+- Remove gdesklets-aarch64.patch and use autoreconf instead.
+
* Sat Sep 27 2014 Rex Dieter <rdieter at fedoraproject.org> 0.36.3-17
- update mimeinfo scriptlets
--
cgit v0.10.2
From 7ffa28e90e892ba64bd51bd101a260d6a366811a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio at serjux.com>
Date: Wed, 10 Jun 2015 03:01:28 +0100
Subject: Remove vfs.patch from sources and from .gitignore
https://bugs.launchpad.net/gdesklets/+bug/890817 , I agree with comment #2.
diff --git a/.gitignore b/.gitignore
index 4559516..404f452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
gDesklets-0.36.2.tar.bz2
/gdesklets-0.36.3.tar.bz2
-/vfs.patch
diff --git a/sources b/sources
index 60aec1f..cea1dfd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
60c0c4e7301b3e653702b6fe5bf7e698 gdesklets-0.36.3.tar.bz2
-e57290bc7e0ed20a092f7794ba2cd6fe vfs.patch
--
cgit v0.10.2
From fcdaa660d634f25a777cd246c87d522350a5fd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio at serjux.com>
Date: Thu, 11 Jun 2015 01:05:40 +0100
Subject: Added 8 patches from upstream.
- Removed vfs.patch (https://bugs.launchpad.net/gdesklets/+bug/890817 , I
agree with comment #2.)
- Removed gdesklets-aarch64.patch and use autoreconf instead.
- Added patch to fix obsoleted m4s.
- Added desktop-database scriptlet.
- Fix License tag and License macro.
- Spec clean up.
- Fix mixed-use-of-spaces-and-tabs.
- Added AppData https://fedoraproject.org/wiki/Packaging:AppData
diff --git a/gdesklets-desktop.patch b/gdesklets-desktop.patch
index d927955..bc9c4b2 100644
--- a/gdesklets-desktop.patch
+++ b/gdesklets-desktop.patch
@@ -1,6 +1,6 @@
-diff -ru rpmbuild/BUILD/gdesklets-0.36.3-orig/data/gdesklets.desktop.in rpmbuild/BUILD/gdesklets-0.36.3/data/gdesklets.desktop.in
---- rpmbuild/BUILD/gdesklets-0.36.3-orig/data/gdesklets.desktop.in 2010-06-07 00:41:57.000000000 -0700
-+++ rpmbuild/BUILD/gdesklets-0.36.3/data/gdesklets.desktop.in 2012-03-20 19:59:38.838192035 -0700
+diff -ru gdesklets-0.36.3-orig/data/gdesklets.desktop.in gdesklets-0.36.3/data/gdesklets.desktop.in
+--- gdesklets-0.36.3-orig/data/gdesklets.desktop.in 2010-06-07 00:41:57.000000000 -0700
++++ gdesklets-0.36.3/data/gdesklets.desktop.in 2012-03-20 19:59:38.838192035 -0700
@@ -3,7 +3,7 @@
Type=Application
Encoding=UTF-8
diff --git a/gdesklets.spec b/gdesklets.spec
index 11aa84a..c51e0c3 100644
--- a/gdesklets.spec
+++ b/gdesklets.spec
@@ -1,18 +1,19 @@
#%define alphatag beta
-Name: gdesklets
-Version: 0.36.3
-Release: 18%{?dist}
-Summary: Architecture for desktop applets
-
-Group: User Interface/Desktops
-License: GPL+
-
-URL: https://launchpad.net/gdesklets
-Source0: https://launchpad.net/gdesklets/0.3x/release-of-%{version}/+download/%{name}-%{version}.tar.bz2
-Patch0: transition.patch
-Patch1: gdesklets-desktop.patch
-Patch2: vfs.patch
+Name: gdesklets
+Version: 0.36.3
+Release: 18%{?dist}
+Summary: Architecture for desktop applets
+Group: User Interface/Desktops
+License: GPLv2+
+URL: https://launchpad.net/gdesklets
+Source0: https://launchpad.net/gdesklets/0.3x/release-of-%{version}/+download/%{name}-%{version}.tar.bz2
+Source1: gdesklets.appdata.xml
+
+# patch0 reported https://bugs.launchpad.net/gdesklets/+bug/1213232
+Patch0: transition.patch
+Patch1: gdesklets-desktop.patch
+Patch3: gdesklets-m4.patch
#Upstream patches
Patch10: 174_173.diff
Patch11: 175_174.diff
@@ -23,14 +24,13 @@ Patch15: 180_179.diff
Patch16: 186_185.diff
Patch17: 188_187.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0
-BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, gvfs-devel
+BuildRequires: python2-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0
+BuildRequires: librsvg2-devel, libgtop2-devel >= 2.8.0, gettext, gvfs-devel
BuildRequires: libXau-devel, libXdmcp-devel, intltool, gnome-python2-devel
BuildRequires: libgnome-devel > 2.6.0, desktop-file-utils, libcap-devel
BuildRequires: autoconf automake libtool
-Requires: gnome-python2-gconf >= 2.6.0
+BuildRequires: libappstream-glib
+Requires: gnome-python2-gconf >= 2.6.0
%description
@@ -42,8 +42,8 @@ bars, weather sensors, news tickers.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .transition
-%patch1 -p3 -b .gdesklets-desktop
-%patch2 -p0 -b .vfs
+%patch1 -p1 -b .gdesklets-desktop
+%patch3 -p1 -b .m4
%patch10 -p0 -b .174
%patch11 -p0 -b .175
@@ -62,40 +62,37 @@ autoreconf -fiv
make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%find_lang %{name}
desktop-file-install \
-%if 0%{?fedora} && 0%{?fedora} < 19
- --vendor="fedora" \
-%endif
- --delete-original \
- --dir=%{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/%{name}.desktop
+ --delete-original \
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
mkdir -p %{buildroot}{%{_bindir},%{_datadir}/%{name}/data/,%{_datadir}/%{name}/Displays/,%{_datadir}/%{name}/Controls/}
# don't want libtool archives
find %{buildroot} -name \*.la | xargs rm
+install -Dp %{SOURCE1} %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+
%post
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
-update-mime-database %{_datadir}/mime &> /dev/null || :
+ /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
fi
+/usr/bin/update-desktop-database &> /dev/null || :
%posttrans
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-
-%clean
-rm -rf %{buildroot}
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS ChangeLog NEWS README
+%license COPYING
%{_bindir}/%{name}
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
@@ -105,12 +102,21 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/
%{_libdir}/%{name}/
%{_mandir}/man1/*
+%{_datadir}/appdata/%{name}.appdata.xml
%changelog
* Tue Jun 09 2015 Sérgio Basto <sergio at serjux.com> - 0.36.3-18
-- Add 8 patches from upstream.
-- Remove gdesklets-aarch64.patch and use autoreconf instead.
+- Added 8 patches from upstream.
+- Removed vfs.patch (https://bugs.launchpad.net/gdesklets/+bug/890817 , I
+ agree with comment #2.)
+- Removed gdesklets-aarch64.patch and use autoreconf instead.
+- Added patch to fix obsoleted m4s.
+- Added desktop-database scriptlet.
+- Fix License tag and License macro.
+- Spec clean up.
+- Fix mixed-use-of-spaces-and-tabs.
+- Added AppData https://fedoraproject.org/wiki/Packaging:AppData
* Sat Sep 27 2014 Rex Dieter <rdieter at fedoraproject.org> 0.36.3-17
- update mimeinfo scriptlets
--
cgit v0.10.2
From 032f910eeda57ca4873ea2488c3e249bd6083b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio at serjux.com>
Date: Thu, 11 Jun 2015 01:10:00 +0100
Subject: add files gdesklets-m4.patch and gdesklets.appdata.xml
diff --git a/gdesklets-m4.patch b/gdesklets-m4.patch
new file mode 100644
index 0000000..dea15b3
--- /dev/null
+++ b/gdesklets-m4.patch
@@ -0,0 +1,19 @@
+--- gdesklets-0.36.3/configure.ac.orig 2015-06-09 16:16:02.719909963 +0100
++++ gdesklets-0.36.3/configure.ac 2015-06-09 16:17:02.753552062 +0100
+@@ -5,7 +5,7 @@ AC_INIT([gDesklets], [0.36.3])
+ AC_CONFIG_SRCDIR([configure.ac])
+ AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
+ LT_INIT
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADER([config.h])
+ AC_CONFIG_MACRO_DIR([macros])
+ AC_CONFIG_FILES([Makefile])
+ AM_MAINTAINER_MODE
+@@ -17,7 +17,6 @@ AC_HEADER_STDC
+ AC_DISABLE_STATIC
+ IT_PROG_INTLTOOL([0.35.0])
+ AC_PROG_INSTALL
+-AC_PROG_LIBTOOL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+
diff --git a/gdesklets.appdata.xml b/gdesklets.appdata.xml
new file mode 100644
index 0000000..1be84b5
--- /dev/null
+++ b/gdesklets.appdata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>gdesklets.desktop</id>
+ <name>gDesklets</name>
+ <summary>Eye candy for your desktop</summary>
+ <url type="homepage">https://launchpad.net/gdesklets</url>
+ <url type="bugtracker">https://bugs.launchpad.net/gdesklets</url>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <description>
+ <p>
+ gDesklets provides an advanced architecture for desktop applets -
+ tiny displays that sit on your desktop such as status meters, icon
+ bars, weather sensors, news tickers.
+ </p>
+ <p>
+ gDesklets is a system for bringing mini programs (desklets), such as
+ weather forecasts, news tickers, system information displays, or music
+ player controls, onto your desktop, where they are sitting there in a
+ symbiotic relationship of eye candy and usefulness. The possibilities are
+ really endless and they are always there to serve you whenever you need
+ them, just one key-press away. The system is not restricted to one desktop
+ environment, but currently works on most of the modern Unix desktops
+ (including GNOME, KDE, Xfce).
+ </p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image>http://en.wikipedia.org/wiki/File:Gdesklets.png</image>
+ <caption>Desktop with running gDesklets</caption>
+ </screenshot>
+ </screenshots>
+</component>
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gdesklets.git/commit/?h=f21&id=b3bf32ba530242ec7f499e25fb9b81a4dcbdba22
More information about the scm-commits
mailing list