From e63ed66bf1628be0e273f1232c7556bb293bda4d Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sat, 3 Feb 2007 22:29:41 +0000 Subject: [PATCH] Removing unused patch. Package-Manager: portage-2.1.2-r6 --- .../orage/files/orage-4.3.90.2-asneeded.patch | 12 - xfce-base/xfce4-panel/Manifest | 4 - .../files/xfdesktop-4.3.99.2-icons.patch | 281 ------------------ 3 files changed, 297 deletions(-) delete mode 100644 xfce-base/orage/files/orage-4.3.90.2-asneeded.patch delete mode 100644 xfce-base/xfdesktop/files/xfdesktop-4.3.99.2-icons.patch diff --git a/xfce-base/orage/files/orage-4.3.90.2-asneeded.patch b/xfce-base/orage/files/orage-4.3.90.2-asneeded.patch deleted file mode 100644 index 7690bb4f5006..000000000000 --- a/xfce-base/orage/files/orage-4.3.90.2-asneeded.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur orage-4.3.90.2.orig/libical/src/libical/Makefile.in orage-4.3.90.2/libical/src/libical/Makefile.in ---- orage-4.3.90.2.orig/libical/src/libical/Makefile.in 2006-07-12 23:34:32.000000000 +0300 -+++ orage-4.3.90.2/libical/src/libical/Makefile.in 2006-07-12 23:41:39.000000000 +0300 -@@ -95,7 +95,7 @@ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(AM_LDFLAGS) $(LDFLAGS) -lpthread -o $@ - SOURCES = $(libical_la_SOURCES) - DIST_SOURCES = $(libical_la_SOURCES) - ETAGS = etags diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest index 9e9c852b8f5c..1fca0c3f28d7 100644 --- a/xfce-base/xfce4-panel/Manifest +++ b/xfce-base/xfce4-panel/Manifest @@ -1,7 +1,3 @@ -AUX xfce4-panel-4.3.90.2-asneeded.patch 618 RMD160 6b93b5b31a66276fc37c286a459c41e4542c7c8e SHA1 f9f9dd0497443560ee5d685e6826b26191a0d7be SHA256 b34b417a5e737ba479dcfedcce5fef29859a86da958916ff4c3b295e1e5d5a75 -MD5 dae0b4aba9b25fa8b034b8456ddce3b5 files/xfce4-panel-4.3.90.2-asneeded.patch 618 -RMD160 6b93b5b31a66276fc37c286a459c41e4542c7c8e files/xfce4-panel-4.3.90.2-asneeded.patch 618 -SHA256 b34b417a5e737ba479dcfedcce5fef29859a86da958916ff4c3b295e1e5d5a75 files/xfce4-panel-4.3.90.2-asneeded.patch 618 DIST xfce4-panel-4.2.3.tar.gz 1395852 RMD160 05a7c450d4ef964ac0e39107a8f891ab307649b2 SHA1 d42a9e3c66b49c8fd4dcb15cd0b8776a60dd43c3 SHA256 cac07e51513ea3f1cf298b2be7dd9500bb81aae3806aaff64de8c15e19003262 DIST xfce4-panel-4.4.0.tar.bz2 818534 RMD160 513f7edf39e0eb12ac029f923be895762fde973c SHA1 eb586f6bb62bfc0b7ed980a2f137474607f4c291 SHA256 28ab25d6933f40ac19a4b6c2b41374360193b8300ad14853fb4ca78d5c152926 EBUILD xfce4-panel-4.2.3.ebuild 589 RMD160 c41365982da57974fda7fe248cfdd906c397dbc3 SHA1 a99a7cccb2d036de4829ef3970071cd65cafd52c SHA256 3c1ca33296d41ffce3b58763c60ed6aebe9678b47c1b490e741ffbb0aa06013b diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.3.99.2-icons.patch b/xfce-base/xfdesktop/files/xfdesktop-4.3.99.2-icons.patch deleted file mode 100644 index 89bcc1ce10eb..000000000000 --- a/xfce-base/xfdesktop/files/xfdesktop-4.3.99.2-icons.patch +++ /dev/null @@ -1,281 +0,0 @@ -Index: src/xfdesktop-icon-view.c -=================================================================== ---- src/xfdesktop-icon-view.c (revision 23748) -+++ src/xfdesktop-icon-view.c (working copy) -@@ -45,8 +45,8 @@ - #define DEFAULT_ICON_SIZE 32 - - #define ICON_SIZE (icon_view->priv->icon_size) --#define TEXT_WIDTH (icon_view->priv->font_size * 9) --#define CELL_PADDING 4 -+#define TEXT_WIDTH ((ICON_SIZE << 1) + (ICON_SIZE >> 1)) /* aka 2.5x */ -+#define CELL_PADDING 6 - #define CELL_SIZE (TEXT_WIDTH + CELL_PADDING * 2) - #define SPACING 6 - #define SCREEN_MARGIN 8 -@@ -277,7 +277,12 @@ - static void xfdesktop_icon_view_modify_font_size(XfdesktopIconView *icon_view, - gint size); - static void xfdesktop_ird_free(XfdesktopIdleRepaintData *ird); -+static void xfdesktop_icon_view_add_item_internal(XfdesktopIconView *icon_view, -+ XfdesktopIcon *icon); -+static gboolean xfdesktop_icon_view_icon_find_position(XfdesktopIconView *icon_view, -+ XfdesktopIcon *icon); - -+ - enum - { - TARGET_XFDESKTOP_ICON = 9999, -@@ -1323,7 +1328,7 @@ - PangoContext *pctx; - GdkScreen *gscreen; - GdkWindow *groot; -- GList *l; -+ GList *l, *leftovers = NULL; - - icon_view->priv->parent_window = gtk_widget_get_toplevel(widget); - g_return_if_fail(icon_view->priv->parent_window); -@@ -1399,12 +1404,14 @@ - icon_view); - - for(l = icon_view->priv->pending_icons; l; l = l->next) { -- g_object_set_data(G_OBJECT(l->data), "--xfdesktop-icon-view", NULL); -- xfdesktop_icon_view_add_item(icon_view, XFDESKTOP_ICON(l->data)); -- g_object_unref(G_OBJECT(l->data)); -+ XfdesktopIcon *icon = XFDESKTOP_ICON(l->data); -+ if(xfdesktop_icon_view_icon_find_position(icon_view, icon)) -+ xfdesktop_icon_view_add_item_internal(icon_view, icon); -+ else -+ leftovers = g_list_prepend(leftovers, icon); - } - g_list_free(icon_view->priv->pending_icons); -- icon_view->priv->pending_icons = NULL; -+ icon_view->priv->pending_icons = g_list_reverse(leftovers); - } - - static void -@@ -1458,10 +1465,9 @@ - g_signal_handlers_disconnect_by_func(G_OBJECT(l->data), - G_CALLBACK(xfdesktop_icon_view_clear_icon_extents), - icon_view); -- icon_view->priv->pending_icons = g_list_prepend(icon_view->priv->pending_icons, -- l->data); - } -- g_list_free(icon_view->priv->icons); -+ icon_view->priv->pending_icons = g_list_concat(icon_view->priv->icons, -+ icon_view->priv->pending_icons); - icon_view->priv->icons = NULL; - - g_free(icon_view->priv->grid_layout); -@@ -2046,17 +2052,16 @@ - static void - xfdesktop_grid_do_resize(XfdesktopIconView *icon_view) - { -- GList *l; -+ GList *l, *leftovers = NULL; - - /* move all icons into the pending_icons list */ - for(l = icon_view->priv->icons; l; l = l->next) { - g_signal_handlers_disconnect_by_func(G_OBJECT(l->data), - G_CALLBACK(xfdesktop_icon_view_clear_icon_extents), - icon_view); -- icon_view->priv->pending_icons = g_list_prepend(icon_view->priv->pending_icons, -- l->data); - } -- g_list_free(icon_view->priv->icons); -+ icon_view->priv->pending_icons = g_list_concat(icon_view->priv->icons, -+ icon_view->priv->pending_icons); - icon_view->priv->icons = NULL; - - DUMP_GRID_LAYOUT(icon_view); -@@ -2071,12 +2076,14 @@ - - /* add all icons back */ - for(l = icon_view->priv->pending_icons; l; l = l->next) { -- g_object_set_data(G_OBJECT(l->data), "--xfdesktop-icon-view", NULL); -- xfdesktop_icon_view_add_item(icon_view, XFDESKTOP_ICON(l->data)); -- g_object_unref(G_OBJECT(l->data)); -+ XfdesktopIcon *icon = XFDESKTOP_ICON(l->data); -+ if(xfdesktop_icon_view_icon_find_position(icon_view, icon)) -+ xfdesktop_icon_view_add_item_internal(icon_view, icon); -+ else -+ leftovers = g_list_prepend(leftovers, icon); - } - g_list_free(icon_view->priv->pending_icons); -- icon_view->priv->pending_icons = NULL; -+ icon_view->priv->pending_icons = g_list_reverse(leftovers); - - gtk_widget_queue_draw(GTK_WIDGET(icon_view)); - } -@@ -2168,8 +2175,11 @@ - guint16 row, - guint16 col) - { -- g_return_val_if_fail(row < icon_view->priv->nrows -- && col < icon_view->priv->ncols, FALSE); -+ if(row >= icon_view->priv->nrows -+ || col >= icon_view->priv->ncols) -+ { -+ return FALSE; -+ } - - return !icon_view->priv->grid_layout[col * icon_view->priv->nrows + row]; - } -@@ -2484,63 +2494,89 @@ - return GTK_WIDGET(icon_view); - } - -+static void -+xfdesktop_icon_view_add_item_internal(XfdesktopIconView *icon_view, -+ XfdesktopIcon *icon) -+{ -+ guint16 row, col; -+ GdkRectangle fake_area; -+ -+ /* sanity check: at this point this should be taken care of */ -+ g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col)); -+ -+ xfdesktop_grid_unset_position_free(icon_view, icon); -+ -+ icon_view->priv->icons = g_list_prepend(icon_view->priv->icons, icon); -+ -+ g_signal_connect_swapped(G_OBJECT(icon), "pixbuf-changed", -+ G_CALLBACK(xfdesktop_icon_view_clear_icon_extents), -+ icon_view); -+ g_signal_connect_swapped(G_OBJECT(icon), "label-changed", -+ G_CALLBACK(xfdesktop_icon_view_clear_icon_extents), -+ icon_view); -+ -+ fake_area.x = SCREEN_MARGIN + icon_view->priv->xorigin + col * CELL_SIZE; -+ fake_area.y = SCREEN_MARGIN + icon_view->priv->yorigin + row * CELL_SIZE; -+ fake_area.width = fake_area.height = CELL_SIZE; -+ xfdesktop_icon_view_paint_icon(icon_view, icon, &fake_area); -+} -+ -+static gboolean -+xfdesktop_icon_view_icon_find_position(XfdesktopIconView *icon_view, -+ XfdesktopIcon *icon) -+{ -+ guint16 row, col; -+ -+ if(!xfdesktop_icon_get_position(icon, &row, &col) -+ || !xfdesktop_grid_is_free_position(icon_view, row, col)) -+ { -+ if(xfdesktop_grid_get_next_free_position(icon_view, &row, &col)) { -+ DBG("old position didn't exist or isn't free, got (%d,%d) instead", -+ row, col); -+ xfdesktop_icon_set_position(icon, row, col); -+ } else { -+ DBG("can't fit icon on screen"); -+ return FALSE; -+ } -+ } -+ -+ return TRUE; -+} -+ - void - xfdesktop_icon_view_add_item(XfdesktopIconView *icon_view, - XfdesktopIcon *icon) - { -- gboolean icon_has_pos; - guint16 row, col; -- GdkRectangle fake_area; - - g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(icon_view) - && XFDESKTOP_IS_ICON(icon)); - -- icon_has_pos = xfdesktop_icon_get_position(icon, &row, &col); -- - /* ensure the icon isn't already in an icon view */ - g_return_if_fail(!g_object_get_data(G_OBJECT(icon), - "--xfdesktop-icon-view")); - - g_object_set_data(G_OBJECT(icon), "--xfdesktop-icon-view", icon_view); -+ g_object_ref(G_OBJECT(icon)); - - if(!GTK_WIDGET_REALIZED(GTK_WIDGET(icon_view))) { -- if(icon_has_pos) { -+ /* if we aren't realized, we don't know what our grid looks like, so -+ * just hang onto the icon for later */ -+ if(xfdesktop_icon_get_position(icon, &row, &col)) { - icon_view->priv->pending_icons = g_list_prepend(icon_view->priv->pending_icons, -- g_object_ref(G_OBJECT(icon))); -+ icon); - } else { - icon_view->priv->pending_icons = g_list_append(icon_view->priv->pending_icons, -- g_object_ref(G_OBJECT(icon))); -+ icon); - } -- return; -+ } else { -+ if(xfdesktop_icon_view_icon_find_position(icon_view, icon)) -+ xfdesktop_icon_view_add_item_internal(icon_view, icon); -+ else { -+ icon_view->priv->pending_icons = g_list_append(icon_view->priv->pending_icons, -+ icon); -+ } - } -- -- if(!icon_has_pos || !xfdesktop_grid_is_free_position(icon_view, row, col)) { -- if(xfdesktop_grid_get_next_free_position(icon_view, &row, &col)) { -- DBG("old position didn't exist or isn't free, got (%d,%d) instead", -- row, col); -- xfdesktop_icon_set_position(icon, row, col); -- } else { -- DBG("can't fit icon on screen"); -- return; -- } -- } -- -- xfdesktop_grid_unset_position_free(icon_view, icon); -- -- icon_view->priv->icons = g_list_prepend(icon_view->priv->icons, -- g_object_ref(G_OBJECT(icon))); -- -- g_signal_connect_swapped(G_OBJECT(icon), "pixbuf-changed", -- G_CALLBACK(xfdesktop_icon_view_clear_icon_extents), -- icon_view); -- g_signal_connect_swapped(G_OBJECT(icon), "label-changed", -- G_CALLBACK(xfdesktop_icon_view_clear_icon_extents), -- icon_view); -- -- fake_area.x = SCREEN_MARGIN + icon_view->priv->xorigin + col * CELL_SIZE; -- fake_area.y = SCREEN_MARGIN + icon_view->priv->yorigin + row * CELL_SIZE; -- fake_area.width = fake_area.height = CELL_SIZE; -- xfdesktop_icon_view_paint_icon(icon_view, icon, &fake_area); - } - - void -@@ -2592,7 +2628,6 @@ - xfdesktop_icon_view_remove_all(XfdesktopIconView *icon_view) - { - GList *l; -- gboolean realized; - guint16 row, col; - - g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(icon_view)); -@@ -2607,12 +2642,9 @@ - icon_view->priv->pending_icons = NULL; - } - -- realized = GTK_WIDGET_REALIZED(GTK_WIDGET(icon_view)); - for(l = icon_view->priv->icons; l; l = l->next) { -- if(realized) { -- if(xfdesktop_icon_get_position(XFDESKTOP_ICON(l->data), &row, &col)) -- xfdesktop_grid_set_position_free(icon_view, row, col); -- } -+ if(xfdesktop_icon_get_position(XFDESKTOP_ICON(l->data), &row, &col)) -+ xfdesktop_grid_set_position_free(icon_view, row, col); - - g_signal_handlers_disconnect_by_func(G_OBJECT(l->data), - G_CALLBACK(xfdesktop_icon_view_clear_icon_extents), -@@ -2635,7 +2667,7 @@ - icon_view->priv->last_clicked_item = NULL; - icon_view->priv->first_clicked_item = NULL; - -- if(realized) -+ if(GTK_WIDGET_REALIZED(icon_view)) - gtk_widget_queue_draw(GTK_WIDGET(icon_view)); - } - -- 2.26.2