nonamedotc pushed to xfdashboard (master). "Update to 0.3.91 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Mar 28 22:49:41 UTC 2015
>From 7763fdd8f8ec387f2f9655ac04032ec75547897d Mon Sep 17 00:00:00 2001
From: Mukundan Ragavan <nonamedotc at fedoraproject.org>
Date: Sat, 28 Mar 2015 17:49:28 -0500
Subject: Update to 0.3.91
- Removed upstreamed patches
- Updated to source and URL to point to xfce project links
diff --git a/.gitignore b/.gitignore
index 1c3233c..05734e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/0.3.8.tar.gz
/0.3.9.tar.gz
/0.3.90.tar.gz
+/xfdashboard-0.3.91.tar.bz2
diff --git a/Fix-crash-due-to-missing-icons.patch b/Fix-crash-due-to-missing-icons.patch
deleted file mode 100644
index 662e01b..0000000
--- a/Fix-crash-due-to-missing-icons.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8c5f8785c04f3725434a339615a4b2803e470315 Mon Sep 17 00:00:00 2001
-From: Stephan Haller <nomad at froevel.de>
-Date: Mon, 23 Mar 2015 07:27:23 +0100
-Subject: [PATCH] Do not throw error message (but a warning message) if neither
- the requested icon nor the fallback icon can be loaded even if xfdashboard
- will look more ugly than usual ;)
-
-That should fix some crashes seen at systems running Fedora.
----
- xfdashboard/image-content.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xfdashboard/image-content.c b/xfdashboard/image-content.c
-index 60489c5..53b0a2b 100644
---- a/xfdashboard/image-content.c
-+++ b/xfdashboard/image-content.c
-@@ -594,7 +594,7 @@ static void _xfdashboard_image_content_load_from_icon_name(XfdashboardImageConte
- /* If we still got no icon info then we cannot load icon at all */
- if(!iconInfo)
- {
-- g_error(_("Could not lookup fallback icon for icon '%s'"), priv->iconName);
-+ g_warning(_("Could not lookup fallback icon '%s' for icon '%s'"), XFDASHBOARD_IMAGE_CONTENT_FALLBACK_ICON_NAME, priv->iconName);
- return;
- }
-
---
-2.3.3
-
diff --git a/force-x11-clutter.patch b/force-x11-clutter.patch
deleted file mode 100644
index 87d7077..0000000
--- a/force-x11-clutter.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xfdashboard/main.c.orig 2015-03-09 19:42:04.119603095 -0500
-+++ xfdashboard/main.c 2015-03-09 19:42:13.290616241 -0500
-@@ -187,11 +187,18 @@
- GError *error=NULL;
- gint status;
-
--#if !defined(GLIB_CHECK_VERSION) || !GLIB_CHECK_VERSION(2, 36, 0)
-+#if !GLIB_CHECK_VERSION(2, 36, 0)
- /* Initialize GObject type system */
- g_type_init();
- #endif
-
-+#if CLUTTER_CHECK_VERSION(1, 16, 0)
-+ /* Enforce X11 backend in Clutter. This function must be called before any
-+ * other Clutter API function.
-+ */
-+ clutter_set_windowing_backend("x11");
-+#endif
-+
- /* Check for running instance (keep only one instance) */
- app=xfdashboard_application_get_default();
- if(!app)
diff --git a/sources b/sources
index 9d80210..c705784 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28cda3998505c7d663d68f5f71c76d23 0.3.90.tar.gz
+1aa8febb80399d7c75f2cc7243a40c6c xfdashboard-0.3.91.tar.bz2
diff --git a/xfdashboard-switch-workspace.patch b/xfdashboard-switch-workspace.patch
deleted file mode 100644
index 55abff6..0000000
--- a/xfdashboard-switch-workspace.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- xfdashboard-0.1.4/src/stage.c 2014-02-23 08:53:19.000000000 -0600
-+++ issue1-stage.c 2014-02-26 18:54:48.629034392 -0600
-@@ -486,9 +486,6 @@
- {
- XfdashboardStagePrivate *priv=self->priv;
- XfdashboardWindowTrackerWindow *stageWindow;
-- GdkScreen *screen;
-- gint primaryMonitor;
-- GdkRectangle geometry;
-
- g_return_if_fail(XFDASHBOARD_IS_STAGE(self));
- g_return_if_fail(XFDASHBOARD_IS_WINDOW_TRACKER_WINDOW(inWindow));
-@@ -499,17 +496,6 @@
- stageWindow=xfdashboard_window_tracker_window_get_stage_window(CLUTTER_STAGE(self));
- if(stageWindow!=inWindow) return;
-
-- /* TODO: As long as we do not support multi-monitors
-- * use this hack to ensure stage is in right size
-- */
-- screen=gdk_screen_get_default();
-- primaryMonitor=gdk_screen_get_primary_monitor(screen);
-- gdk_screen_get_monitor_geometry(screen, primaryMonitor, &geometry);
-- clutter_actor_set_size(CLUTTER_ACTOR(self), geometry.width, geometry.height);
-- xfdashboard_window_tracker_window_move_resize(stageWindow,
-- geometry.x, geometry.y,
-- geometry.width, geometry.height);
--
- /* Set up window for use as stage window */
- priv->stageWindow=inWindow;
- xfdashboard_window_tracker_window_make_stage_window(priv->stageWindow);
-@@ -745,6 +731,9 @@
- {
- XfdashboardStagePrivate *priv;
- XfdashboardApplication *application;
-+ GdkScreen *screen;
-+ gint primaryMonitor;
-+ GdkRectangle geometry;
-
- priv=self->priv=XFDASHBOARD_STAGE_GET_PRIVATE(self);
-
-@@ -773,6 +762,14 @@
-
- g_signal_connect_swapped(self, "key-release-event", G_CALLBACK(_xfdashboard_stage_on_key_release), self);
-
-+ /* TODO: As long as we do not support multi-monitors
-+ * use this hack to ensure stage is in right size
-+ */
-+ screen=gdk_screen_get_default();
-+ primaryMonitor=gdk_screen_get_primary_monitor(screen);
-+ gdk_screen_get_monitor_geometry(screen, primaryMonitor, &geometry);
-+ clutter_actor_set_size(CLUTTER_ACTOR(self), geometry.width, geometry.height);
-+
- /* Connect signal to application */
- application=xfdashboard_application_get_default();
- g_signal_connect_swapped(application, "suspend", G_CALLBACK(_xfdashboard_stage_on_application_suspend), self);
diff --git a/xfdashboard.spec b/xfdashboard.spec
index 6e78739..86f7523 100644
--- a/xfdashboard.spec
+++ b/xfdashboard.spec
@@ -1,12 +1,13 @@
+%global majorversion 0.3
+
Name: xfdashboard
-Version: 0.3.90
-Release: 2%{?dist}
+Version: 0.3.91
+Release: 1%{?dist}
Summary: GNOME shell like dashboard for Xfce
License: GPLv2+
-URL: http://xfdashboard.froevel.de
-Source0: https://github.com/gmc-holle/xfdashboard/archive/%{version}.tar.gz
-Patch0: Fix-crash-due-to-missing-icons.patch
+URL: http://goodies.xfce.org/projects/applications/%{name}/start
+Source0: http://archive.xfce.org/src/apps/xfdashboard/%{majorversion}/%{name}-%{version}.tar.bz2
BuildRequires: libwnck3-devel
BuildRequires: clutter-devel
@@ -34,7 +35,6 @@ Additional themes for use with Xfdashboard
%prep
%setup -q
-%patch0 -p1 -b .fix-icon-missing-crash
%build
export CFLAGS="%{optflags}"
@@ -79,6 +79,11 @@ fi
%{_datadir}/themes/%{name}-*
%changelog
+* Sat Mar 28 2015 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 0.3.91-1
+- Update to 0.3.91
+- Removed upstreamed patches
+- Updated to source and URL to point to xfce project links
+
* Thu Mar 26 2015 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 0.3.90-2
- Fix for crash due to missing icons
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xfdashboard.git/commit/?h=master&id=7763fdd8f8ec387f2f9655ac04032ec75547897d
More information about the scm-commits
mailing list