diff options
| -rw-r--r-- | media-radio/xlog/ChangeLog | 5 | ||||
| -rw-r--r-- | media-radio/xlog/Manifest | 10 | ||||
| -rw-r--r-- | media-radio/xlog/files/xlog-1.9-destdir.patch | 14 | ||||
| -rw-r--r-- | media-radio/xlog/files/xlog-1.9-docdir.patch | 25 | ||||
| -rw-r--r-- | media-radio/xlog/files/xlog-1.9-key.patch | 12 | ||||
| -rw-r--r-- | media-radio/xlog/files/xlog-1.9-map.patch | 91 | ||||
| -rw-r--r-- | media-radio/xlog/xlog-2.0.1.ebuild (renamed from media-radio/xlog/xlog-1.9.ebuild) | 6 |
7 files changed, 9 insertions, 154 deletions
diff --git a/media-radio/xlog/ChangeLog b/media-radio/xlog/ChangeLog index 80a7626b1..a539a149b 100644 --- a/media-radio/xlog/ChangeLog +++ b/media-radio/xlog/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Apr 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de> -xlog-1.9.ebuild, + -files/xlog-1.9-destdir.patch, -files/xlog-1.9-docdir.patch, + -files/xlog-1.9-key.patch, -files/xlog-1.9-map.patch, +xlog-2.0.1.ebuild: + Version bump + 14 Jan 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de> xlog-1.9.ebuild, +files/xlog-1.9-map.patch: Added minor bugfix from upstream diff --git a/media-radio/xlog/Manifest b/media-radio/xlog/Manifest index 84bec30aa..4193bcdcd 100644 --- a/media-radio/xlog/Manifest +++ b/media-radio/xlog/Manifest @@ -1,9 +1,5 @@ AUX xlog-1.9-desktop-update.patch 1393 RMD160 045463b085cb4587b571c9ecbf70aafadaf5b716 SHA1 d4143c9f581ab1859f7ea38584248f61358e0b05 SHA256 c9f9afee6309420b875363a3a52a996e48e98c6d6d236c91c2c81c78ce21c13a -AUX xlog-1.9-destdir.patch 440 RMD160 ed55ea3b45d55ac34845a2abe699cd4f24bdac56 SHA1 8e9842a1e879699846ebd236ade3bed4b2c60f39 SHA256 6a19fd2261a6f6e558c9a18bfde880d3d38b5fcf8f8e5fc6e303baa1a9b6d14c -AUX xlog-1.9-docdir.patch 776 RMD160 2269c980193ed5faefe72106cbd5f4de1771ff1a SHA1 00a51b7dab4622b2d326da0d9f30a4349a6427e5 SHA256 8388793db0757fa565e736ffd12dafd820756c458e01389a8a11edb748e23774 -AUX xlog-1.9-key.patch 436 RMD160 5da5c3ba2b709aa02828aae053c04a8d542550e1 SHA1 fd9663bf71714320c7e570a03a00837e2c4fde3f SHA256 29a157c2a78cc7b41daddd34b1763cf15d767365cc1b2a12de50e24aa04ff2a8 -AUX xlog-1.9-map.patch 2805 RMD160 11d4a1dd41cb8e3cc39650c58692dbe1a5e109b5 SHA1 1460c663cff4cbf75b2c4c32e51c37166cdcfbe4 SHA256 4a17ea2075f15a0fdd55beb2119d8eecaac498f5efd7a64f16d3d8670a317f24 -DIST xlog-1.9.tar.gz 11074235 RMD160 1779743ff234eb86f76f921bfc439e38d001515e SHA1 aa458886b2d89dc0c29ab3548d5664e235bf63b3 SHA256 b1e0a5289f4d716a1b9f2c33291b5e26eac724234193f0570c6f3ed11d809d76 -EBUILD xlog-1.9.ebuild 1634 RMD160 bc55232d9c5e30176a993e5b0b95e358e5f2cab3 SHA1 a597172ab0ef2410c955f5dbdd6423f1278745d1 SHA256 53b776c8a7ddd228286bf4e7f7164ff6432bc02bb24bd7b6d7aad80b47b6ddf3 -MISC ChangeLog 1918 RMD160 68052beac69016e118875b5530b0632cc4e6d64f SHA1 5502fe4c72c557d6df0a79abe57e853bcd96dad4 SHA256 99d076d345531746ea13261069bb58a0ddb2409abb86a37e24d49dc6043c15e0 +DIST xlog-2.0.1.tar.gz 11118591 RMD160 bea95a17aa037ab219e0f1741d92542d21056c7d SHA1 f7df2908640197a64b35049fde19ae0025ead388 SHA256 718289032a1ed2dcea778e6b8b3ee0b31d2f3e43f07b328a71fcfb34c4ed1eb3 +EBUILD xlog-2.0.1.ebuild 1500 RMD160 1c74d792beb50f1f1863fba44b7b8f62381173d4 SHA1 afa7afb9df4821da0c1a6379153f13449ca304e3 SHA256 d7d50c2590246b2a8932452735608bcbda67f8d8f94935f8adec964b61bc03cc +MISC ChangeLog 2149 RMD160 7e55f93764cdcde234300b698c2ccb27c2a1120d SHA1 5f3a4ac4003590f3359fb67a130381c19e5b4698 SHA256 a9690d66569130286d44e9226fd82a82b9243bdf07635bd60322bd31715ad181 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/media-radio/xlog/files/xlog-1.9-destdir.patch b/media-radio/xlog/files/xlog-1.9-destdir.patch deleted file mode 100644 index 639860b81..000000000 --- a/media-radio/xlog/files/xlog-1.9-destdir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.am.orig 2009-01-11 18:06:38.000000000 +0100 -+++ Makefile.am 2009-01-11 18:08:23.000000000 +0100 -@@ -8,8 +8,8 @@ - - install-data-local: - @$(NORMAL_INSTALL) -- $(INSTALL_DATA) AUTHORS $(docdir) -- $(INSTALL_DATA) ChangeLog $(docdir) -- $(INSTALL_DATA) BUGS $(docdir) -+ $(INSTALL_DATA) AUTHORS $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) ChangeLog $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) BUGS $(DESTDIR)$(docdir) - - ACLOCAL_AMFLAGS = -I m4 diff --git a/media-radio/xlog/files/xlog-1.9-docdir.patch b/media-radio/xlog/files/xlog-1.9-docdir.patch deleted file mode 100644 index 1b8c5d6ac..000000000 --- a/media-radio/xlog/files/xlog-1.9-docdir.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- data/doc/Makefile.am.orig 2009-01-11 18:27:28.000000000 +0100 -+++ data/doc/Makefile.am 2009-01-11 18:28:21.000000000 +0100 -@@ -67,10 +67,9 @@ - manual/xlog-pagesetupdialog.png \ - manual/xlog-workedwindow.png - --docdir = $(datadir)/doc/xlog - doc_DATA = $(DOC_FILES) - --manualdir = $(datadir)/doc/xlog/manual -+manualdir = $(docdir)/manual - manual_DATA = $(MANUAL_FILES) - - EXTRA_DIST = $(DOC_FILES) $(MANUAL_FILES) $(TEX_FILES) ---- src/Makefile.am.orig 2009-01-11 19:56:43.000000000 +0100 -+++ src/Makefile.am 2009-01-11 19:57:03.000000000 +0100 -@@ -12,7 +12,7 @@ - -DDATADIR=\""$(datadir)"\" \ - -DXLOG_LOCALEDIR=\""$(datadir)/locale"\" \ - -DXLOG_DATADIR=\""$(datadir)/xlog"\" \ -- -DXLOG_DOCDIR=\""$(datadir)/doc/xlog"\" -+ -DXLOG_DOCDIR=\""$(docdir)"\" - - CLEANFILES = *~ - diff --git a/media-radio/xlog/files/xlog-1.9-key.patch b/media-radio/xlog/files/xlog-1.9-key.patch deleted file mode 100644 index 10d17c7f0..000000000 --- a/media-radio/xlog/files/xlog-1.9-key.patch +++ /dev/null @@ -1,12 +0,0 @@ -# fixes directory for KEYS file ---- src/gui_keys.c.orig 2009-01-12 07:19:32.000000000 +0100 -+++ src/gui_keys.c 2009-01-12 07:19:47.000000000 +0100 -@@ -88,7 +88,7 @@ - #ifdef G_OS_WIN32 - helpfile = g_strdup_printf ("%s", filename); - #else -- helpfile = g_strdup_printf ("%s%s%s", XLOG_DATADIR, G_DIR_SEPARATOR_S, -+ helpfile = g_strdup_printf ("%s%s%s", XLOG_DOCDIR, G_DIR_SEPARATOR_S, - filename); - #endif - buf = g_new0 (gchar, 100); diff --git a/media-radio/xlog/files/xlog-1.9-map.patch b/media-radio/xlog/files/xlog-1.9-map.patch deleted file mode 100644 index 5505d78cc..000000000 --- a/media-radio/xlog/files/xlog-1.9-map.patch +++ /dev/null @@ -1,91 +0,0 @@ -# fix for incorrect handling of country maps ---- src/gui_countrymap.c.orig 2009-01-14 08:32:47.000000000 +0100 -+++ src/gui_countrymap.c 2009-01-14 08:29:54.000000000 +0100 -@@ -29,13 +29,15 @@ - - GtkWidget *countrymap = NULL; - static GdkPixmap *pm = NULL; -- --extern gchar *prefixformaps; -+static gchar *pxformaps = NULL; -+static gint savew = -1, saveh = -1; - - static gboolean - map_delete (GtkWidget * widget, GdkEvent *event, gpointer user_data) - { - countrymap = NULL; -+ g_free (pxformaps); -+ pxformaps = NULL; - return FALSE; - } - -@@ -60,14 +62,14 @@ - pm = gdk_pixmap_new(da->window, da->allocation.width, da->allocation.height, -1); - gdk_draw_rectangle(pm, da->style->white_gc, TRUE, 0, 0, - da->allocation.width, da->allocation.height); -- if (prefixformaps) -+ if (pxformaps) - { - #ifdef G_OS_WIN32 - gchar *map_location = g_strconcat -- ("maps", G_DIR_SEPARATOR_S, prefixformaps, ".png", NULL); -+ ("maps", G_DIR_SEPARATOR_S, pxformaps, ".png", NULL); - #else - gchar *map_location = g_strconcat (XLOG_DATADIR, G_DIR_SEPARATOR_S, -- "maps", G_DIR_SEPARATOR_S, prefixformaps, ".png", NULL); -+ "maps", G_DIR_SEPARATOR_S, pxformaps, ".png", NULL); - #endif - GdkPixbuf *background = gdk_pixbuf_new_from_file (map_location, NULL); - g_free (map_location); -@@ -92,6 +94,8 @@ - - void countrymap_refresh (gchar *px) - { -+ if (!g_ascii_strcasecmp(px, pxformaps)) return; -+ pxformaps = g_strdup (px); - #ifdef G_OS_WIN32 - gchar *map_location = g_strconcat - ("maps", G_DIR_SEPARATOR_S, px, ".png", NULL); -@@ -101,7 +105,20 @@ - #endif - gint width, height; - GdkPixbufFormat *f = gdk_pixbuf_get_file_info (map_location, &width, &height); -- if (f) gdk_window_resize (countrymap->window, width, height); -+ if (f) -+ { -+ if (width != savew || height != saveh) -+ { -+ gdk_window_resize (countrymap->window, width, height); -+ savew = width; -+ saveh = height; -+ } -+ else -+ { -+ GtkWidget *da = lookup_widget (countrymap, "da"); -+ map_configure (da, NULL, NULL); -+ } -+ } - g_free (map_location); - } - -@@ -128,18 +145,7 @@ - gtk_container_add (GTK_CONTAINER(countrymap), da); - g_signal_connect (da, "expose_event", G_CALLBACK (map_expose), NULL); - g_signal_connect (da, "configure_event", G_CALLBACK (map_configure), NULL); -- -+ GLADE_HOOKUP_OBJECT (countrymap, da, "da"); -+ pxformaps = g_strdup (""); - gtk_widget_show_all (countrymap); -- --#ifdef G_OS_WIN32 -- gchar *map_location = g_strconcat -- ("maps", G_DIR_SEPARATOR_S, prefixformaps, ".png", NULL); --#else -- gchar *map_location = g_strconcat (XLOG_DATADIR, G_DIR_SEPARATOR_S, -- "maps", G_DIR_SEPARATOR_S, prefixformaps, ".png", NULL); --#endif -- gint width, height; -- GdkPixbufFormat *f = gdk_pixbuf_get_file_info (map_location, &width, &height); -- if (f) gdk_window_resize (countrymap->window, width, height); -- g_free (map_location); - } diff --git a/media-radio/xlog/xlog-1.9.ebuild b/media-radio/xlog/xlog-2.0.1.ebuild index 8db5deea4..9efd807ba 100644 --- a/media-radio/xlog/xlog-1.9.ebuild +++ b/media-radio/xlog/xlog-2.0.1.ebuild @@ -27,11 +27,7 @@ src_unpack() { # fixes for wrong placed file and bug in gui_countrymap.c # fix for respecting DESTDIR and # and finally fix to respect docdir=... - epatch "${FILESDIR}/${P}-desktop-update.patch" \ - "${FILESDIR}/${P}-key.patch" \ - "${FILESDIR}/${P}-map.patch" \ - "${FILESDIR}/${P}-destdir.patch" \ - "${FILESDIR}/${P}-docdir.patch" + epatch "${FILESDIR}/${PN}-1.9-desktop-update.patch" mkdir -p "${S}"/m4 # make autoconf happy... eautoreconf } |