diff options
-rw-r--r-- | x11-plugins/fsviewer/ChangeLog | 6 | ||||
-rw-r--r-- | x11-plugins/fsviewer/Manifest | 25 | ||||
-rw-r--r-- | x11-plugins/fsviewer/files/fsviewer-0.2.5-windowmaker.patch | 335 | ||||
-rw-r--r-- | x11-plugins/fsviewer/fsviewer-0.2.5.ebuild | 56 |
4 files changed, 6 insertions, 416 deletions
diff --git a/x11-plugins/fsviewer/ChangeLog b/x11-plugins/fsviewer/ChangeLog index 0deaa0b63391..68c59faae73e 100644 --- a/x11-plugins/fsviewer/ChangeLog +++ b/x11-plugins/fsviewer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/fsviewer # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.25 2015/03/02 09:29:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/ChangeLog,v 1.26 2015/05/29 21:43:42 mrueg Exp $ + + 29 May 2015; Manuel Rüger <mrueg@gentoo.org> + -files/fsviewer-0.2.5-windowmaker.patch, -fsviewer-0.2.5.ebuild: + Remove old. 02 Mar 2015; Agostino Sarubbo <ago@gentoo.org> fsviewer-0.2.6.ebuild: Stable for ppc, wrt bug #507088 diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest index a52b67a0cd75..e2f84fb75deb 100644 --- a/x11-plugins/fsviewer/Manifest +++ b/x11-plugins/fsviewer/Manifest @@ -1,28 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX fsviewer-0.2.5-windowmaker.patch 10838 SHA256 7672ad43c4997d97528aaf48ba936f1636e446670af189d7f3abb972139ae049 SHA512 1fb3d78abb0f6b8ea4a9b73a459d8060284a5b1b6bd1d3f1cee2299d9131278498a47779e748d3b184703bcb03d911dc2eac685fdd9d711001c2cb63e0038d27 WHIRLPOOL 3a47747ca62efe7a39eaed007932109f24ddf5e99c4d48af1965f3aaba5fc9fd1a8eac47fd28f31bcba08880397898043f3e5a089cdf78c2b5e3b4c6a194fe1f AUX fsviewer-0.2.6-wmaker-0.95_support.patch 1624 SHA256 33446814da6bfc8b35f6ff79630de1cfe83319edb8356bba4e9775720aba01aa SHA512 d9cde107c34f13e4041d8c20d98e2051acf7c518f60454b891b4fe3a83995eb65e4db51f1699911f480fe09ea1d938750f620a85a9b71bc6f5f48affbe3c4dd9 WHIRLPOOL 0c47b8b8488ed8114953717ea530d1c82460ac491bbb6ab94532c5aecf0217b606a8a8def9f401312b78d91b1049cff12c7257a430776f328acb7d86d75481e3 -DIST FSViewer.app-0.2.5.tar.gz 858696 SHA256 12bbf02df5d8561c26a2934403fade8a1fca6efa4a00f15addaaf2d0c3d3aea8 DIST fsviewer-app-0.2.6.tar.bz2 785422 SHA256 18f964da350bf617a76ccca6411000862394bca09f7616b5b019d6a760bfa57b SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b WHIRLPOOL b3304d65687dd1444787caadfd31164cd67535adad99e5d8d6c6b221187130d44653276ffb3048961db87d2e877f76adf25b635a9c8fa98b427224ce2e012e76 -EBUILD fsviewer-0.2.5.ebuild 1177 SHA256 c37ebc806d9ad6b30b7bee948b3571e99055a4d5695835dc8cb26aa381c8a10a SHA512 289eb5ff449ac54aa4486e88d683ab36c97a46541d1b07ccf29e986e30f600040b6a47357e5ceb399b0f728c2c56e50b433196eb926c635a5bc01dc54ce9629a WHIRLPOOL 221922783e6a1d6a7e1d11bcbf369db821b85ff1037ea86ba81c3155c26a4c4f080a0696ff7364ee1d1c84418a61626b61da300529d84957065d443530b4eb7f EBUILD fsviewer-0.2.6.ebuild 1033 SHA256 97f5d7fbdad3869547e1151556d13394bb7c6af87a3e6eb323f3248187e35b0b SHA512 075a84f80414ddb02d1d6a1de2a6ac347ecf6ed19372b6ebd6e2cb4c6237c701d1a47f48c737d7ed5d1119b0bb95b6d946b647f9eb894c36adad40f17ea122da WHIRLPOOL 247d4182265d484328fd775ff79f11ccfbf51fe477d8ec305175d7afabdbbdc98bb48e9b932c4f8d8a27315eeeb3937678f6166db0fa000887fa61ed98b1c45a -MISC ChangeLog 3057 SHA256 cff14153379941e754588a881153dad50d778b57af4184dd52a2ab4e5288bd1a SHA512 48ba5f65eb621bde4bb3cb5b874197563cb0c51f834a9b20abcb9b693aed37fea6f1ba0f3d96f2d8d976849f4ca2362be86afb3154b9a005aa3081e96e64326b WHIRLPOOL 0e92fb02adc8018ef4f0c3c2b18b2d8a575c0ef6dff368a9a35e1a5c1d435c1501a6a54a39572ee8b4fd43bf4b0719607e67a537628b5ca6b7454a4f919d5a19 +MISC ChangeLog 3189 SHA256 5d0be55500c322affeb9b691ea13ead2453d6b528342cb6570bf406f64c7b5a8 SHA512 1eed6e692e17ee021ea541afe5f5f14a38b4a4b5e029cb9015844b1624d7fabba7555a3ae94061229f5ffd472a4ad639802dc67a14d647d5cb72d50fc90e68e3 WHIRLPOOL ef8ddee7058b1c2437d66b564874f5d6498e846a294665609e013c39c0c08eba14f063ee3ba10dd754e42a42845707000208621bcb947ee42e3fb36ef0f82cde MISC metadata.xml 166 SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941 SHA512 85f57124de5c89f57dfd2f9c969701908554ebd07f50a084835ae35d91395fe79c6fa002c040546854009e700e7c65e9345fdb3a616978fab14c08939721f616 WHIRLPOOL 203631ae3c7368dbd852a4ae2d6826d6bbc02a3417f816c84c8b16220aafff00a62e5b3bb46d231e4702fbce62b4a172c8db1aac275b6c8975dc669dfc9bd7a9 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJU9C2MAAoJELp701BxlEWfygkP/0u+jBnDaMhMA37IdUvj5s90 -PS2yZBR4a5zK8Jtsd5tF2iDZfJW2FtAAnP/tYDaDn6/2oFpiq71+wut8Tdd8+U4t -NfPixOC6XMdvem83le+yHLl5EahFMVlfjyFdwVmCLPaG/NFjhPHRtEBXBLUbBuWe -tbJLDKG4IHZwc6TwnE9+LE6Ma8kQhymTff2QTMphjlF5JrX0msop9XTxAcbYcfNS -bAaG1uKYwMwrPjG2rra6z8XpxNDowHjl2F0l9fPMzv+kZqRCNIZuMxXHfGbM95Fv -wxwLCP8veC0w2yFHxIkBfem7wCxLDHYOsdQ+f8LSzsPAM4t+avWtO8gDCbRXDunD -/GnQB/oLsdlRzo42E/FSpXRI7f9XPcdZ/hlmWv+b7vySwyannBJ6SvShdt10d2k7 -038DdO9lYKP78/H4UYKMAdoOOBFra8pNFl0gtlVR33sEDOAunkV6UreLMIyGJGsR -bPyvqU4TtFO+QaiBfGMaw+IhySfNKJekjDs1ga6w7tR28qlDjcg7tEnYyJ1p+Mt0 -w5y95lJbBnq2rk1DAJid8dAZYNstm45mOlR7wEdHNnv56TrgqnaWfQFCqM1JCHPV -P42/krX11VI9/N0WW+44HcibWp48SjpQIc2IoO+XvmlTfMpd2sJgYoEwhDbk+6ya -r1MQuuc96CadHF/qRUrw -=vqjm ------END PGP SIGNATURE----- diff --git a/x11-plugins/fsviewer/files/fsviewer-0.2.5-windowmaker.patch b/x11-plugins/fsviewer/files/fsviewer-0.2.5-windowmaker.patch deleted file mode 100644 index bc23ef32f75e..000000000000 --- a/x11-plugins/fsviewer/files/fsviewer-0.2.5-windowmaker.patch +++ /dev/null @@ -1,335 +0,0 @@ -diff -Nur FSViewer.app-0.2.5-alt/src/FSBrowser.c FSViewer.app-0.2.5/src/FSBrowser.c ---- FSViewer.app-0.2.5-alt/src/FSBrowser.c Thu Dec 19 21:26:35 2002 -+++ FSViewer.app-0.2.5/src/FSBrowser.c Mon Dec 23 15:11:58 2002 -@@ -278,13 +278,13 @@ - &titleLen, widthC); - W_PaintText(bPtr->view, bPtr->view->window, scr->boldFont, x, - (bPtr->titleHeight-WMFontHeight(scr->boldFont))/2, -- bPtr->columnSize.width, WACenter, WMColorGC(scr->white), -+ bPtr->columnSize.width, WACenter, WMWhiteColor(scr), - False, titleBuf, titleLen); - free (titleBuf); - } else { - W_PaintText(bPtr->view, bPtr->view->window, scr->boldFont, x, - (bPtr->titleHeight-WMFontHeight(scr->boldFont))/2, -- bPtr->columnSize.width, WACenter, WMColorGC(scr->white), -+ bPtr->columnSize.width, WACenter, WMWhiteColor(scr), - False, bPtr->titles[column], titleLen); - } - } -@@ -621,7 +621,7 @@ - - - static void --paintItem(WMList *lPtr, int index, Drawable d, char *text, int state, -+paintItem(WMList *lPtr, int index, Drawable d, char *text, int state, - WMRect *rect) - { - WMView *view = W_VIEW(lPtr); -@@ -630,19 +630,18 @@ - /* WMListItem *item; */ - - /* item = WMGetListItem(lPtr, index); */ -- -+ - width = rect->size.width; - height = rect->size.height; - x = rect->pos.x; - y = rect->pos.y; - - if (state & WLDSSelected) -- XFillRectangle(scr->display, d, WMColorGC(scr->white), x, y, -+ WMPaintColorSwatch(WMWhiteColor(scr), d, x, y, - width, height); --/* else if(item->uflags & 1) */ --/* XFillRectangle(scr->display, d, WMColorGC(WMCreateNamedColor(scr, "yellow", False)), x, y, width, height); */ - else -- XClearArea(scr->display, d, x, y, width, height, False); -+ WMPaintColorSwatch(WMGetWidgetBackgroundColor(lPtr), d, x, y, -+ width, height); - - if (text) { - /* Avoid overlaping... */ -@@ -652,11 +651,11 @@ - char *textBuf = createTruncatedString(scr->normalFont, - text, &textLen, widthC); - W_PaintText(view, d, scr->normalFont, x+4, y, widthC, -- WALeft, WMColorGC(scr->black), False, textBuf, textLen); -+ WALeft, WMBlackColor(scr), False, textBuf, textLen); - free(textBuf); - } else { -- W_PaintText(view, d, scr->normalFont, x+4, y, widthC, -- WALeft, WMColorGC(scr->black), False, text, textLen); -+ W_PaintText(view, d, scr->normalFont, x+4, y, widthC, -+ WALeft, WMBlackColor(scr), False, text, textLen); - } - } - -diff -Nur FSViewer.app-0.2.5-alt/src/FSFileButton.c FSViewer.app-0.2.5/src/FSFileButton.c ---- FSViewer.app-0.2.5-alt/src/FSFileButton.c Thu Dec 19 21:26:35 2002 -+++ FSViewer.app-0.2.5/src/FSFileButton.c Mon Dec 23 14:52:07 2002 -@@ -518,7 +518,7 @@ - { - - W_PaintText(view, d, screen->normalFont, x+ix, y+iy, -- strwidth, WACenter, WMColorGC(screen->black), -+ strwidth, WACenter, WMBlackColor(screen), - True, text, strlen(text)); - } - -@@ -711,7 +711,7 @@ - XSetWindowBackgroundPixmap(WMScreenDisplay(scr), view->window, pix); - XClearWindow(WMScreenDisplay(scr), view->window); - W_PaintText(view, pix, scr->normalFont, 2, 1, width, WACenter, -- WMColorGC(scr->black), False, text, len); -+ WMBlackColor(scr), False, text, len); - if(pix) - XFreePixmap(scr->display, pix); - -diff -Nur FSViewer.app-0.2.5-alt/src/FSMCList.c FSViewer.app-0.2.5/src/FSMCList.c ---- FSViewer.app-0.2.5-alt/src/FSMCList.c Thu Dec 19 21:26:35 2002 -+++ FSViewer.app-0.2.5/src/FSMCList.c Mon Dec 23 15:13:14 2002 -@@ -257,7 +257,7 @@ - { - char *path; - FileInfo *fileList; -- FileInfo *start; -+ FileInfo *start = NULL; - WMListItem *listItem; - FSMCList *mPtr = (FSMCList *)(WMGetHangedData(bPtr)); - WMList *list = FSGetBrowserListInColumn(bPtr, column); -@@ -408,7 +408,7 @@ - if (width >= 3*dLen) { - int dddLen = 3*dLen; - int tmpTextLen = *textLen; -- -+ - strcpy(textBuf, text); - while (tmpTextLen - && (WMWidthOfString(font, textBuf, tmpTextLen)+dddLen > width)) -@@ -429,7 +429,7 @@ - } - - static void --paintItem(WMList *lPtr, int index, Drawable d, -+paintItem(WMList *lPtr, int index, Drawable d, - char *text, int state, WMRect *rect) - { - int i = 0; -@@ -450,17 +450,18 @@ - x = rect->pos.x; - y = rect->pos.y; - fontHeight = WMFontHeight(scr->normalFont); -- -+ - /* Highlight the selected area */ - if (state & WLDSSelected) -- XFillRectangle(scr->display, d, WMColorGC(scr->white), -- x, y, width, height); -+ WMPaintColorSwatch(WMWhiteColor(scr), d, x, y, -+ width, height); - else -- XClearArea(scr->display, d, x, y, width, height, False); -+ WMPaintColorSwatch(WMGetWidgetBackgroundColor(lPtr), d, x, y, -+ width, height); - - if(item->clientData) - { -- str = wstrdup(item->clientData); -+ str = wstrdup(item->clientData); - len = strlen(str); - } - else -@@ -513,10 +514,10 @@ - else - image = WMCreatePixmapFromXPMData(scr, list_file_xpm); - size = WMGetPixmapSize(image); -- WMDrawPixmap(image, d, -+ WMDrawPixmap(image, d, - x+6+(20-size.width)/2, (height-size.height)/2+y); - WMReleasePixmap(image); -- -+ - } - else - { -@@ -527,52 +528,52 @@ - else - tmpStr = wstrdup("F"); - -- W_PaintText(view, d, scr->boldFont, -+ W_PaintText(view, d, scr->boldFont, - x+6, y+(height-fontHeight)/2, widthC, -- WALeft, WMColorGC(scr->darkGray), False, -+ WALeft, WMDarkGrayColor(scr), False, - tmpStr, 1); - - free(tmpStr); - } -- -- if (WMWidthOfString(scr->normalFont, items[i], textLen) > widthC) -+ -+ if (WMWidthOfString(scr->normalFont, items[i], textLen) > widthC) - { - char *textBuf = createTruncatedString(scr->normalFont, -- items[i], &textLen, -+ items[i], &textLen, - widthC); -- -- W_PaintText(view, d, scr->normalFont, -+ -+ W_PaintText(view, d, scr->normalFont, - x+26, y+(height-fontHeight)/2, widthC, -- WALeft, WMColorGC(scr->black), False, -+ WALeft, WMBlackColor(scr), False, - textBuf, textLen); - - free(textBuf); - } -- else -+ else - { -- W_PaintText(view, d, scr->normalFont, -+ W_PaintText(view, d, scr->normalFont, - x+26, y+(height-fontHeight)/2, widthC, -- WALeft, WMColorGC(scr->black), False, items[i], -+ WALeft, WMBlackColor(scr), False, items[i], - textLen); - } - x += 194; -- } -+ } - else if(i==3) - { -- W_PaintText(view, d, scr->normalFont, -+ W_PaintText(view, d, scr->normalFont, - x+6, y+(height-fontHeight)/2, 100, -- WALeft, WMColorGC(scr->black), False, items[i], -+ WALeft, WMBlackColor(scr), False, items[i], - strlen(items[i])); - x += 100; - } - else - { -- W_PaintText(view, d, scr->normalFont, -+ W_PaintText(view, d, scr->normalFont, - x+6, y+(height-fontHeight)/2, 82, -- WALeft, WMColorGC(scr->black), False, items[i], -+ WALeft, WMBlackColor(scr), False, items[i], - strlen(items[i])); - x += 82; -- } -+ } - free(items[i]); - items[i] = NULL; - } -diff -Nur FSViewer.app-0.2.5-alt/src/FSPrefs.c FSViewer.app-0.2.5/src/FSPrefs.c ---- FSViewer.app-0.2.5-alt/src/FSPrefs.c Thu Dec 19 21:26:35 2002 -+++ FSViewer.app-0.2.5/src/FSPrefs.c Mon Dec 23 15:14:09 2002 -@@ -1913,25 +1913,26 @@ - WMListItem *item = WMGetListItem(lPtr, index); - - if (item->selected) -- XFillRectangle(scr->display, view->window, WMColorGC(scr->white), -- rect->pos.x, rect->pos.y, -+ WMPaintColorSwatch(WMWhiteColor(scr), d, -+ rect->pos.x, rect->pos.y, - rect->size.width, rect->size.height); - else -- XClearArea(scr->display, view->window, rect->pos.x, rect->pos.y, -- rect->size.width, rect->size.height, False); -+ WMPaintColorSwatch(WMGetWidgetBackgroundColor(lPtr), d, -+ rect->pos.x, rect->pos.y, -+ rect->size.width, rect->size.height); - - if(item->uflags) - { -- W_PaintText(view, view->window, scr->boldFont, -+ W_PaintText(view, d, scr->boldFont, - rect->pos.x+4, rect->pos.y, rect->size.width, -- WALeft, WMColorGC(scr->black), False, -+ WALeft, WMBlackColor(scr), False, - item->text, strlen(item->text)); - } - else - { -- W_PaintText(view, view->window, scr->normalFont, -+ W_PaintText(view, d, scr->normalFont, - rect->pos.x+4, rect->pos.y, rect->size.width, -- WALeft, WMColorGC(scr->black), False, -+ WALeft, WMBlackColor(scr), False, - item->text, strlen(item->text)); - } - } -diff -Nur FSViewer.app-0.2.5-alt/src/FSUtils.c FSViewer.app-0.2.5/src/FSUtils.c ---- FSViewer.app-0.2.5-alt/src/FSUtils.c Thu Dec 19 21:26:35 2002 -+++ FSViewer.app-0.2.5/src/FSUtils.c Mon Dec 23 14:55:35 2002 -@@ -976,8 +976,8 @@ - clone = RMakeCenteredImage(image, 64, 64, &color1); - pixmap = WMCreatePixmapFromRImage(scr, clone, 0); - -- RDestroyImage(image); -- RDestroyImage(clone); -+ RReleaseImage(image); -+ RReleaseImage(clone); - - return pixmap; - } -@@ -1028,8 +1028,8 @@ - pixmap = WMCreatePixmapFromRImage(scr, clone, 0); - } - -- RDestroyImage(clone); -- RDestroyImage(image); -+ RReleaseImage(clone); -+ RReleaseImage(image); - - return pixmap; - } -@@ -1068,7 +1068,7 @@ - RClearImage(image, &color); - pixmap = WMCreatePixmapFromRImage(scr, image, 0); - -- RDestroyImage(image); -+ RReleaseImage(image); - - return pixmap; - } -diff -Nur FSViewer.app-0.2.5-alt/src/timestampWidget.c FSViewer.app-0.2.5/src/timestampWidget.c ---- FSViewer.app-0.2.5-alt/src/timestampWidget.c Thu Dec 19 21:26:35 2002 -+++ FSViewer.app-0.2.5/src/timestampWidget.c Mon Dec 23 14:52:07 2002 -@@ -99,6 +99,7 @@ - XpmIcon weekday; - XpmIcon asvisible; - GC gc; -+ WMColor *color; - time_t time; - - struct flags -@@ -236,7 +237,8 @@ - WMCreateEventHandler(timestamp->view, ExposureMask | StructureNotifyMask, handleEvents, timestamp); - - /* Default GC for paint. */ -- timestamp->gc = WMColorGC(scr->gray); -+ timestamp->color = WMGrayColor(scr); -+ timestamp->gc = WMColorGC(timestamp->color); - - W_ResizeView(timestamp->view, TIMESTAMP_MIN_WIDTH, TIMESTAMP_MIN_HEIGHT); - DEBUG_PRINT("Resized View"); -@@ -668,14 +670,14 @@ - { - W_PaintTextAndImage(timestamp->view, - False, -- timestamp->gc, -+ timestamp->color, - scr->normalFont, - WRFlat, - NULL, - WACenter, - timestamp->image, - WIPImageOnly, -- timestamp->gc, -+ timestamp->color, - offset); - DEBUG_PRINT("Painted image"); - } diff --git a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild deleted file mode 100644 index 3c3b06b66b7b..000000000000 --- a/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/fsviewer/fsviewer-0.2.5.ebuild,v 1.14 2014/04/07 19:45:04 ssuominen Exp $ - -EAPI=5 -inherit eutils - -MY_PN=FSViewer - -DESCRIPTION="file system viewer for Window Maker" -HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/" -SRC_URI="http://www.bayernline.de/~gscholz/linux/${PN}/${MY_PN}.app-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND="dev-libs/expat - media-libs/tiff:0 - media-libs/giflib - media-libs/libpng:0 - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libproplist - x11-libs/libSM - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXt - x11-proto/xextproto - x11-proto/xproto - <x11-wm/windowmaker-0.95.0" -DEPEND=${RDEPEND} - -S=${WORKDIR}/${MY_PN}.app-${PV} - -DOCS="" - -src_prepare() { - epatch "${FILESDIR}"/${P}-windowmaker.patch -} - -src_configure() { - econf \ - --with-appspath=/usr/lib/GNUstep \ - --with-extralibs=-lXft -} |