diff options
| -rw-r--r-- | x11-wm/fvwm/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-wm/fvwm/Manifest | 11 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/digest-fvwm-2.5.13 | 3 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/fvwm-2.5.10-FvwmCommand.diff | 34 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/fvwm-2.5.10-Test-update.diff | 44 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/fvwm-2.5.10-mips-compat.diff | 67 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff | 88 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/fvwm-iconman.diff | 55 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/fvwmtabs-2.8-insecure-tmp-handling.diff | 35 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/iconfile-2.5.10.diff | 29 | ||||
| -rw-r--r-- | x11-wm/fvwm/fvwm-2.5.13.ebuild | 250 |
11 files changed, 9 insertions, 616 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 99a3e9b07012..eb21128aa467 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/fvwm # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.98 2005/07/19 12:19:29 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.99 2005/07/19 12:32:42 taviso Exp $ + + 19 Jul 2005; Tavis Ormandy <taviso@gentoo.org> + -files/fvwm-2.5.10-FvwmCommand.diff, -files/fvwm-2.5.10-Test-update.diff, + -files/fvwm-2.5.10-mips-compat.diff, -files/fvwm-2.5.10-post-release.diff, + -files/fvwm-iconman.diff, -files/fvwmtabs-2.8-insecure-tmp-handling.diff, + -files/iconfile-2.5.10.diff, -fvwm-2.5.13.ebuild: + remove stale patches *fvwm-2.5.13-r1 (19 Jul 2005) diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 334ed59a1e5a..2ba7a3a84323 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,25 +1,16 @@ MD5 cfc37d7eb6be1a5a71178973ca1a2e3f fvwm-2.5.13-r1.ebuild 7864 MD5 d4ad99d2edb49ee23de8acb401f8ba0c fvwm-2.5.12.ebuild 8960 -MD5 60a24f01d6dc86f7d8230f805d81a573 fvwm-2.5.13.ebuild 7656 -MD5 201f236ca280a1a073f5fed3343a1754 ChangeLog 17063 +MD5 f074838c8c5ef999d25ea4b466b10ea7 ChangeLog 17417 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 MD5 ba8d61baf42b7f21be2488b3581ff51d fvwm-2.4.18.ebuild 2956 MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550 -MD5 d8a3811b3a9581c42119cdc86dff4c7d files/fvwm-2.5.10-Test-update.diff 702 MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788 -MD5 98b1cd33f30ee47c88a2c3da2b2ddc68 files/fvwm-iconman.diff 2383 MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65 MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209 -MD5 326a3b450dd43ec75b78fd0058026a3b files/digest-fvwm-2.5.13 209 MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431 MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582 MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360 -MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.diff 2349 MD5 20d3c9bb419ce71c80fd25fd85364a45 files/fvwm-64bit-fixes.diff.gz 12220 -MD5 5bda5a33cdd7fc8517aa413550ad4e1e files/iconfile-2.5.10.diff 745 -MD5 0a39299dd7ca570060f545e659c77604 files/fvwm-2.5.10-FvwmCommand.diff 1013 MD5 326a3b450dd43ec75b78fd0058026a3b files/digest-fvwm-2.5.13-r1 209 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425 MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419 -MD5 efd2297324dd0241c2a879beadfabdb7 files/fvwm-2.5.10-mips-compat.diff 2306 -MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923 diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.13 b/x11-wm/fvwm/files/digest-fvwm-2.5.13 deleted file mode 100644 index 2b957746910e..000000000000 --- a/x11-wm/fvwm/files/digest-fvwm-2.5.13 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b95df3d751da3f5fc803a117de758723 fvwm-2.5.13.tar.bz2 1936745 -MD5 93e68afa231548b7e7af4db45082682e fvwm-2.5.11-translucent-menus.diff.gz 3426 -MD5 6e7d19a9130f5b7135c822965805517a FvwmTabs-v3-4.tar.gz 28659 diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-FvwmCommand.diff b/x11-wm/fvwm/files/fvwm-2.5.10-FvwmCommand.diff deleted file mode 100644 index 21c0b0c34ce0..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.5.10-FvwmCommand.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- modules/FvwmCommand/FvwmCommand.c 2003-07-06 15:34:07.000000000 +0100 -+++ modules/FvwmCommand/FvwmCommand.c 2004-05-28 09:26:59.360540104 +0100 -@@ -56,7 +56,6 @@ - void sendit( char *cmd ); - void receive( void ); - static RETSIGTYPE sig_ttin(int); --/* void sig_pipe( int ); */ - static RETSIGTYPE sig_quit(int); - void usage(void); - int read_f(int fd, char *p, int len); -@@ -125,6 +124,7 @@ - sigaction(SIGHUP, &sigact, NULL); - sigaction(SIGQUIT, &sigact, NULL); - sigaction(SIGTERM, &sigact, NULL); -+ sigaction(SIGPIPE, &sigact, NULL); - } - #else - #ifdef USE_BSD_SIGNALS -@@ -135,6 +135,7 @@ - signal(SIGHUP, sig_quit); - signal(SIGQUIT, sig_quit); - signal(SIGTERM, sig_quit); -+ signal(SIGPIPE, sig_quit); - signal(SIGTTIN, sig_ttin); - signal(SIGTTOU, sig_ttin); - #ifdef HAVE_SIGINTERRUPT -@@ -142,6 +143,7 @@ - siginterrupt(SIGHUP, 1); - siginterrupt(SIGQUIT, 1); - siginterrupt(SIGTERM, 1); -+ siginterrupt(SIGPIPE, 1); - siginterrupt(SIGTTIN, 0); - siginterrupt(SIGTTOU, 0); - #endif diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-Test-update.diff b/x11-wm/fvwm/files/fvwm-2.5.10-Test-update.diff deleted file mode 100644 index 477ce6d51dd2..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.5.10-Test-update.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- fvwm/conditional.c 2004-03-02 11:20:48.000000000 +0000 -+++ fvwm/conditional.c 2004-05-09 14:07:19.000000000 +0100 -@@ -1599,19 +1599,23 @@ - while (condition) - { - char *cond; -- Bool on; -+ Bool reverse; - - cond = condition; -- on = 1; -+ reverse = 0; - if (*cond == '!') - { -- on = 0; -+ reverse = 1; - cond++; - } - if (StrEquals(cond, "True")) - { - match = True; - } -+ else if (StrEquals(cond, "False")) -+ { -+ match = False; -+ } - else if (StrEquals(cond, "Version")) - { - char *pattern; -@@ -1698,8 +1702,13 @@ - error = True; - } - } -+ else -+ { -+ /* unrecognized condition */ -+ error = 1; -+ } - -- if (!on) -+ if (reverse) - { - match = !match; - } diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-mips-compat.diff b/x11-wm/fvwm/files/fvwm-2.5.10-mips-compat.diff deleted file mode 100644 index 8d5306a3bfc0..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.5.10-mips-compat.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- fvwm/menuitem.h 2003-06-29 20:53:23.000000000 +0100 -+++ fvwm/menuitem.h 2004-04-20 11:33:37.525963472 +0100 -@@ -125,7 +125,7 @@ - MenuItem *menuitem_create(void); - void menuitem_free(MenuItem *mi); - void menuitem_get_size( -- MenuItem *mi, MenuItemPartSizesT *mips, FlocaleFont *font, -+ MenuItem *mi, MenuItemPartSizesT *mipst, FlocaleFont *font, - Bool do_reverse_icon_order); - void menuitem_paint( - MenuItem *mi, MenuPaintItemParameters *mpip); ---- fvwm/menus.c 2004-01-06 14:05:01.000000000 +0000 -+++ fvwm/menus.c 2004-04-20 11:33:37.562957848 +0100 -@@ -1608,7 +1608,7 @@ - static void calculate_item_sizes(MenuSizingParameters *msp) - { - MenuItem *mi; -- MenuItemPartSizesT mips; -+ MenuItemPartSizesT mipst; - int i; - Bool do_reverse_icon_order = - (MST_USE_LEFT_SUBMENUS(msp->menu)) ? True : False; -@@ -1618,33 +1618,33 @@ - for (mi = MR_FIRST_ITEM(msp->menu); mi != NULL; mi = MI_NEXT_ITEM(mi)) - { - menuitem_get_size( -- mi, &mips, MST_PSTDFONT(msp->menu), -+ mi, &mipst, MST_PSTDFONT(msp->menu), - do_reverse_icon_order); - /* adjust maximums */ -- if (msp->max.i.triangle_width < mips.triangle_width) -+ if (msp->max.i.triangle_width < mipst.triangle_width) - { -- msp->max.i.triangle_width = mips.triangle_width; -+ msp->max.i.triangle_width = mipst.triangle_width; - } -- if (msp->max.i.title_width < mips.title_width) -+ if (msp->max.i.title_width < mipst.title_width) - { -- msp->max.i.title_width = mips.title_width; -+ msp->max.i.title_width = mipst.title_width; - } - for (i = 0; i < MAX_MENU_ITEM_LABELS; i++) - { -- if (msp->max.i.label_width[i] < mips.label_width[i]) -+ if (msp->max.i.label_width[i] < mipst.label_width[i]) - { -- msp->max.i.label_width[i] = mips.label_width[i]; -+ msp->max.i.label_width[i] = mipst.label_width[i]; - } - } -- if (msp->max.i.picture_width < mips.picture_width) -+ if (msp->max.i.picture_width < mipst.picture_width) - { -- msp->max.i.picture_width = mips.picture_width; -+ msp->max.i.picture_width = mipst.picture_width; - } - for (i = 0; i < MAX_MENU_ITEM_MINI_ICONS; i++) - { -- if (msp->max.i.icon_width[i] < mips.icon_width[i]) -+ if (msp->max.i.icon_width[i] < mipst.icon_width[i]) - { -- msp->max.i.icon_width[i] = mips.icon_width[i]; -+ msp->max.i.icon_width[i] = mipst.icon_width[i]; - } - } - } diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff b/x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff deleted file mode 100644 index b6036a5e2681..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff +++ /dev/null @@ -1,88 +0,0 @@ ---- fvwm-2.5.10/fvwm/add_window.c 2004-03-17 14:42:53.000000000 +0000 -+++ fvwm/fvwm/add_window.c 2004-03-30 10:05:08.000000000 +0100 -@@ -937,9 +937,10 @@ - size_borders b; - - XSetWindowAttributes attributes; -- int valuemask = CWBackingStore | CWBackPixmap | CWCursor | CWEventMask | -- CWSaveUnder; -+ int valuemask; - -+ valuemask = CWBackingStore | CWBackPixmap | CWCursor | CWEventMask | -+ CWSaveUnder; - attributes.backing_store = NotUseful; - attributes.background_pixmap = None; - attributes.cursor = Scr.FvwmCursors[CRS_DEFAULT]; -@@ -1829,7 +1830,6 @@ - void setup_frame_attributes( - FvwmWindow *fw, window_style *pstyle) - { -- int i; - XSetWindowAttributes xswa; - - /* Backing_store is controlled on the client, borders, title & buttons -@@ -1847,36 +1847,18 @@ - xswa.backing_store = NotUseful; - break; - } -- XChangeWindowAttributes(dpy, FW_W(fw), CWBackingStore, &xswa); -- if (pstyle->flags.use_backing_store == BACKINGSTORE_OFF) -- { -- xswa.backing_store = NotUseful; -- } -- if (HAS_TITLE(fw)) -- { -- XChangeWindowAttributes( -- dpy, FW_W_TITLE(fw), CWBackingStore, &xswa); -- for (i = 0; i < NUMBER_OF_BUTTONS; i++) -- { -- if (FW_W_BUTTON(fw, i)) -- { -- XChangeWindowAttributes( -- dpy, FW_W_BUTTON(fw, i), -- CWBackingStore, &xswa); -- } -- } -- } -- - /* parent_relative is applied to the frame and the parent */ - xswa.background_pixmap = pstyle->flags.use_parent_relative - ? ParentRelative : None; -- XChangeWindowAttributes(dpy, FW_W_FRAME(fw), CWBackPixmap, &xswa); -- XChangeWindowAttributes(dpy, FW_W_PARENT(fw), CWBackPixmap, &xswa); -- - /* Save_under is only useful on the frame */ - xswa.save_under = pstyle->flags.do_save_under - ? Scr.flags.do_save_under : NotUseful; -- XChangeWindowAttributes(dpy, FW_W_FRAME(fw), CWSaveUnder, &xswa); -+ XChangeWindowAttributes(dpy, FW_W(fw), CWBackingStore, &xswa); -+ XChangeWindowAttributes( -+ dpy, FW_W_PARENT(fw), CWBackPixmap | CWBackingStore, &xswa); -+ XChangeWindowAttributes( -+ dpy, FW_W_FRAME(fw), -+ CWBackPixmap | CWBackingStore | CWSaveUnder, &xswa); - - return; - } ---- fvwm-2.5.10/modules/FvwmTaskBar/FvwmTaskBar.c 2004-03-15 13:48:52.000000000 +0000 -+++ fvwm/modules/FvwmTaskBar/FvwmTaskBar.c 2004-03-30 10:05:09.000000000 +0100 -@@ -532,7 +532,6 @@ - - win_border = nb; - win_width = nw; -- win_height = nh; - win_has_title = nht; - win_title_dir = ntd; - win_title_height = nth; ---- fvwm-2.5.10/modules/FvwmButtons/FvwmButtons.1 2002-11-09 15:18:52.000000000 +0000 -+++ fvwm/modules/FvwmButtons/FvwmButtons.1 2004-03-30 10:05:08.000000000 +0100 -@@ -1127,7 +1127,8 @@ - - # Pop up a module menu directly above the button. - *FvwmButtons: (9x1+3+0, Padding 0, Title "Modules", \\ -- Action `Menu Modulepopup rectangle $wx$h+$l+$t o+50 -100m`) -+ Action `Menu Modulepopup rectangle \\ -+ $widthx$height+$lleft+$top o+50 -100m`) - - # first row of buttons from left to right: - *FvwmButtons: (3x2+0+1, Icon my_lock.xpm, Action `Exec xlock`) diff --git a/x11-wm/fvwm/files/fvwm-iconman.diff b/x11-wm/fvwm/files/fvwm-iconman.diff deleted file mode 100644 index 150176222c25..000000000000 --- a/x11-wm/fvwm/files/fvwm-iconman.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff -pru fvwm/modules/FvwmIconMan/FvwmIconMan.h fvwm.new/modules/FvwmIconMan/FvwmIconMan.h ---- fvwm/modules/FvwmIconMan/FvwmIconMan.h 2003-04-26 19:37:06.000000000 +0200 -+++ fvwm.new/modules/FvwmIconMan/FvwmIconMan.h 2003-05-20 11:46:26.000000000 +0200 -@@ -313,7 +313,7 @@ typedef struct win_manager { - WeightedSort *weighted_sorts; - int weighted_sorts_len, weighted_sorts_size; - char *AnimCommand; -- Uchar showonlyiconic; -+ int showonlyiconic; - Uchar showtransient; - rectangle managed_g; /* dimensions of managed screen portion */ - -Tylko w fvwm.new/modules/FvwmIconMan: FvwmIconMan.h~ -diff -pru fvwm/modules/FvwmIconMan/readconfig.c fvwm.new/modules/FvwmIconMan/readconfig.c ---- fvwm/modules/FvwmIconMan/readconfig.c 2003-04-26 19:37:18.000000000 +0200 -+++ fvwm.new/modules/FvwmIconMan/readconfig.c 2003-05-20 11:48:41.000000000 +0200 -@@ -1572,11 +1572,14 @@ void read_in_resources() - ConsoleMessage("Need argument to showonlyicons\n"); - continue; - } -- if (!strcasecmp(p, "true")) { -+ if (!strcasecmp (p, "false")) { -+ i = 0; -+ } -+ else if (!strcasecmp (p, "true")) { - i = 1; - } -- else if (!strcasecmp(p, "false")) { -- i = 0; -+ else if (!strcasecmp (p, "never")) { -+ i = 2; - } - else { - ConsoleMessage("Bad line: %s\n", current_line); -Tylko w fvwm.new/modules/FvwmIconMan: readconfig.c~ -diff -pru fvwm/modules/FvwmIconMan/xmanager.c fvwm.new/modules/FvwmIconMan/xmanager.c ---- fvwm/modules/FvwmIconMan/xmanager.c 2003-04-26 19:37:23.000000000 +0200 -+++ fvwm.new/modules/FvwmIconMan/xmanager.c 2003-05-20 11:49:39.000000000 +0200 -@@ -1415,9 +1415,12 @@ void check_in_window(WinData *win) - - if (win->manager && win->complete) { - is_state_selected = -- ((!win->manager->showonlyiconic || win->iconified) && -- (win->manager->showtransient || !IS_TRANSIENT(win))); -- in_viewport = win_in_viewport(win); -+ (((!win->iconified&&(win->manager->showonlyiconic==2))|| -+ (win->manager->showonlyiconic==0)|| -+ ((win->iconified&&(win->manager->showonlyiconic==1)) -+ ))&& -+ (win->manager->showtransient || !IS_TRANSIENT(win))); -+ in_viewport = win_in_viewport(win); - if (win->manager->usewinlist && DO_SKIP_WINDOW_LIST(win)) - in_viewport = 0; - if (win->button == NULL && in_viewport && is_state_selected) { -Tylko w fvwm.new/modules/FvwmIconMan: xmanager.c~ diff --git a/x11-wm/fvwm/files/fvwmtabs-2.8-insecure-tmp-handling.diff b/x11-wm/fvwm/files/fvwmtabs-2.8-insecure-tmp-handling.diff deleted file mode 100644 index 391d704b3e74..000000000000 --- a/x11-wm/fvwm/files/fvwmtabs-2.8-insecure-tmp-handling.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- FvwmTabs.orig 2003-11-11 10:37:10.000000000 +0000 -+++ FvwmTabs 2003-11-11 11:40:30.000000000 +0000 -@@ -64,7 +64,7 @@ - balloonBG => '#C0C080', - balloonMsg => 'Tab %tabNo:\n%iconText\n%title', - autoResize => 'false', -- stateFile => '/tmp/.fvwmtabs.state', -+ stateFile => <~/.fvwmtabs.state>, # / - fixedSizeTabs => 'false', - showTitlebar => 'true', - useTMTitlebar => 'true', ---- FvwmTabs.1.orig 2003-11-11 11:23:59.000000000 +0000 -+++ FvwmTabs.1 2003-11-11 11:24:06.000000000 +0000 -@@ -225,7 +225,7 @@ - \&\fIbool\fR can be either \fItrue\fR or \fIfalse\fR. If true, windows in the tab-manager automatically resize to the dimensions of the largest window in the tab-manager. The default value is \fIfalse\fR. - .Ip "*FvwmTabs: stateFile \fIfile\fR" 4 - .IX Item "FvwmTabs: stateFile file" --\&\fBFvwmTabs\fR has the ability to preserve its state (ie. remember the windows it has swallowed as tabs) b/w \s-1FVWM\s0 restarts. \fIfile\fR specifies the name of a temporary file to record the state in, so it can be reconstructed when \fBFvwmTabs\fR restarts. The default file is \f(CW\*(C`/tmp/.fvwmtabs.state\*(C'\fR. -+\&\fBFvwmTabs\fR has the ability to preserve its state (ie. remember the windows it has swallowed as tabs) b/w \s-1FVWM\s0 restarts. \fIfile\fR specifies the name of a temporary file to record the state in, so it can be reconstructed when \fBFvwmTabs\fR restarts. - .Ip "*FvwmTabs: fixedSizeTabs \fIbool\fR" 4 - .IX Item "*FvwmTabs: fixedSizeTabs bool" - \&\fIbool\fR can be either \fItrue\fR or \fIfalse\fR. If true, the tab-manager will ensure each tab-button has the same dimensions. If false, the selected tab is expanded so that it is fully visible. The default value is \fIfalse\fR. ---- fvwmtabrc.orig 2003-11-11 11:00:57.000000000 +0000 -+++ fvwmtabrc 2003-11-11 11:39:41.000000000 +0000 -@@ -216,8 +216,8 @@ - # stateFile - specifies the name of a temporary file to use to record the - # state (ie. remember the windows it has swallowed as tabs) b/w FVWM - # restarts. --# default: /tmp/.fvwmtabs.state --*FvwmTabs: stateFile /tmp/.fvwmtabs.state -+# default: /home/user/.fvwmtabs.state -+#*FvwmTabs: stateFile /home/user/.fvwmtabs.state - - # fixedSizeTabs - ensure each tab-button has the same dimensions. If false, - # the selected tab is expanded so that it is fully visible. diff --git a/x11-wm/fvwm/files/iconfile-2.5.10.diff b/x11-wm/fvwm/files/iconfile-2.5.10.diff deleted file mode 100644 index 7861967f309d..000000000000 --- a/x11-wm/fvwm/files/iconfile-2.5.10.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -ru fvwm-2.5.10.orig/fvwm/expand.c fvwm-2.5.10/fvwm/expand.c ---- fvwm-2.5.10.orig/fvwm/expand.c 2004-02-16 10:50:06.000000000 +0000 -+++ fvwm-2.5.10/fvwm/expand.c 2004-06-20 18:46:48.713094728 +0100 -@@ -376,15 +376,19 @@ - } - break; - case VAR_W_ICONFILE: -- if (fw && !IS_EWMH_DESKTOP(FW_W(fw))) -- { -- string = fw->icon_bitmap_file; -- } -- break; - case VAR_W_MINIICONFILE: - if (fw && !IS_EWMH_DESKTOP(FW_W(fw))) - { -- string = fw->mini_pixmap_file; -+ char *t; -+ -+ t = (i == VAR_W_ICONFILE) ? -+ fw->icon_bitmap_file : fw->mini_pixmap_file; -+ /* expand the path if possible */ -+ string = PictureFindImageFile(t, NULL, R_OK); -+ if (!string) -+ { -+ string = t; -+ } - } - break; - case VAR_W_CLASS: diff --git a/x11-wm/fvwm/fvwm-2.5.13.ebuild b/x11-wm/fvwm/fvwm-2.5.13.ebuild deleted file mode 100644 index ad38b1698f40..000000000000 --- a/x11-wm/fvwm/fvwm-2.5.13.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.13.ebuild,v 1.1 2005/07/17 00:21:26 taviso Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" -HOMEPAGE="http://www.fvwm.org/" -SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 - mirror://gentoo/fvwm-2.5.11-translucent-menus.diff.gz - perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3-4.tar.gz )" - -LICENSE="GPL-2 FVWM" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="bidi debug gtk gtk2 imlib nls perl png readline rplay stroke tcltk truetype xinerama" - -RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 ) - gtk? ( =x11-libs/gtk+-1.2* - imlib? ( >=media-libs/gdk-pixbuf-0.21.0 - >=media-libs/imlib-1.9.14-r1 ) ) - rplay? ( >=media-sound/rplay-3.3.2 ) - bidi? ( >=dev-libs/fribidi-0.10.4 ) - png? ( >=media-libs/libpng-1.0.12-r2 ) - stroke? ( >=dev-libs/libstroke-0.4 ) - perl? ( tcltk? ( >=dev-lang/tk-8.3.4 - >=dev-perl/perl-tk-800.024-r2 - >=dev-perl/X11-Protocol-0.52 ) ) - truetype? ( virtual/xft >=media-libs/fontconfig-2.1-r1 ) - >=dev-lang/perl-5.6.1-r10 - >=sys-libs/zlib-1.1.4-r1 - sys-apps/debianutils - virtual/x11" -# XXX: gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency? -# XXX: gtk perl bindings require dev-perl/gtk-perl, worth a dependency? -# XXX: netpbm is used by FvwmScript-ScreenDump, worth a dependency? -DEPEND="${RDEPEND} dev-util/pkgconfig !x11-wm/metisse" - -SFT=${WORKDIR}/FvwmTabs-v3-4 - -src_unpack() { - unpack ${A} - - # this patch enables fast translucent menus in fvwm. this is a - # minor tweak of a patch posted to fvwm-user mailing list by Olivier - # Chapuis in <20030827135125.GA6370@snoopy.folie>. - cd ${S}; epatch ${WORKDIR}/fvwm-2.5.11-translucent-menus.diff - - if use perl; then - # I'll supply a default icon for FvwmTabs, this removes the need for - # installing an iconset, this one comes from the fvwm_icons package. - cd ${SFT} - ebegin " Setting default icon for FvwmTabs" - sed -i 's#happyMini.xpm#/usr/share/fvwm/mini-happy.xpm#g' \ - FvwmTabs FvwmTabs.1 fvwmtabrc - eend $? - fi - - # fixing #51287, the fvwm-menu-xlock script is not compatible - # with the xlockmore implementation in portage. - cd ${S}; epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff -} - -src_compile() { - local myconf="--libexecdir=/usr/lib \ - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm \ - --enable-package-subdirs" - - # use readline in FvwmConsole. - if ! use readline; then - myconf="${myconf} --without-readline-library" - else - myconf="${myconf} --with-readline-library --without-termcap-library" - fi - - # FvwmGtk can be built as a gnome application, or a Gtk+ application. - if ! use gtk; then - myconf="${myconf} --disable-gtk --without-gnome" - else - if ! use imlib; then - einfo "ATTN: You can safely ignore any imlib related configure errors." - myconf="${myconf} --with-imlib-prefix=${T}" - fi - myconf="${myconf} --without-gnome" - fi - - # rplay is a cool, but little used way of playing sounds over a network - if ! use rplay; then - myconf="${myconf} --without-rplay-library" - fi - - # Install perl bindings. - if use perl; then - myconf="${myconf} --enable-perllib" - else - myconf="${myconf} --disable-perllib" - fi - - # xinerama support for those who have multi-headed machines. - if use xinerama; then - myconf="${myconf} --enable-xinerama" - else - myconf="${myconf} --disable-xinerama" - fi - - # bidirectional writing support, eg hebrew - if use bidi; then - myconf="${myconf} --enable-bidi" - else - myconf="${myconf} --disable-bidi" - fi - - # png image support (very nice in fvwm) - if ! use png; then - myconf="${myconf} --without-png-library" - fi - - # native language support - if use nls; then - myconf="${myconf} --enable-nls --enable-iconv" - else - myconf="${myconf} --disable-nls --disable-iconv" - fi - - # support for mouse gestures using libstroke (very very cool) - if ! use stroke; then - myconf="${myconf} --without-stroke-library" - fi - - # more verbosity for module developers/hackers/etc. - if use debug; then - myconf="${myconf} --enable-debug-msgs --enable-command-log" - fi - - # Xft Anti Aliased text support - if use truetype; then - myconf="${myconf} --enable-xft" - else - myconf="${myconf} --disable-xft" - fi - - # set the local maintainer for fvwm-bug. - export FVWM_BUGADDR="taviso@gentoo.org" - - econf ${myconf} || die - emake || die -} - -src_install() { - make DESTDIR=${D} install || die - - if use perl; then - - local toolkits="gtk2 gtk tcltk" - - if use tcltk; then - # Install the very cool FvwmTabs module - # http://users.tpg.com.au/users/scottie7/FvwmTabs - einfo "Installing FvwmTabs module..." - - exeinto /usr/lib/fvwm/${PV}/ - doexe ${SFT}/FvwmTabs - - dodoc ${SFT}/fvwmtabrc ${SFT}/tab.zsh - doman ${SFT}/FvwmTabs.1 - dohtml ${SFT}/FvwmTabs.man.html - - newdoc ${SFT}/README README.fvwmtabs - - # install default drag and drop icon. - insinto /usr/share/fvwm - newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm - else - # Remove the Tk bindings (requires perl-tk) - rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm - toolkits=${toolkits/tcltk/} - fi - if ! use gtk; then - # Remove gtk bindings (requires gtk-perl/gtk2-perl) - rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \ - ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm - toolkits=${toolkits/gtk2/} - toolkits=${toolkits/gtk/} - else - if ! use gtk2; then - # Just remove the gtk2 bindings (requires gtk2-perl) - rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm - toolkits=${toolkits/gtk2/} - fi - fi - toolkits=${toolkits// /} - if ! test "${toolkits}"; then - # No perl toolkit bindings wanted, remove the unneeded files - # and empty directories. - rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm - find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null - fi - else - # Remove useless script if perllib isnt required. - rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1 - fi - - # neat utility for testing fvwm behaviour on applications setting various - # hints, creates a simple black window with configurable hints set. - if use debug; then - dobin ${S}/tests/hints/hints_test - newdoc ${S}/tests/hints/README README.hints - fi - - # fvwm-convert-2.6 is just a stub, contains no code - remove it for now. - # fvwm-convert-2.2 has a man page, but the script is no longer distributed. - rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1 - rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1 - - # ive included `exec` to save a few bytes of memory. - echo "#!/bin/bash" > fvwm2 - echo "exec /usr/bin/fvwm2" >> fvwm2 - - exeinto /etc/X11/Sessions - doexe fvwm2 - - dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \ - docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \ - docs/fvwm.lsm - - dodoc utils/fvwm_make_directory_menu.sh utils/fvwm_make_browse_menu.sh \ - utils/quantize_pixmaps utils/xselection.c - - dodoc ${FILESDIR}/README.transluceny.gz - - # fix a couple of symlinks. - prepallman -} - -pkg_postinst() { - if use perl; then - if use tcltk; then - einfo "By setting the perl and tcltk USE flags, you have elected to" - einfo "install the FvwmTabs module, a configurable tabbing system" - einfo "for FVWM. You can read more about FvwmTabs here:" - einfo - einfo " http://users.tpg.com.au/users/scottie7/fvwmtabs.html" - einfo - fi - fi - echo - einfo "For information about the changes in this release, please" - einfo "refer to the NEWS file." - echo -} |