diff options
| -rw-r--r-- | sysutils/fsviewer/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/fsviewer/distinfo | 9 | ||||
| -rw-r--r-- | sysutils/fsviewer/patches/patch-ab | 13 | ||||
| -rw-r--r-- | sysutils/fsviewer/patches/patch-ac | 13 | ||||
| -rw-r--r-- | sysutils/fsviewer/patches/patch-ad | 11 | ||||
| -rw-r--r-- | sysutils/fsviewer/patches/patch-ae | 37 |
6 files changed, 79 insertions, 11 deletions
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile index d65c8c76d10..c9c00edcdba 100644 --- a/sysutils/fsviewer/Makefile +++ b/sysutils/fsviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/07/22 17:42:08 wiz Exp $ # DISTNAME= FSViewer.app-0.2.3 @@ -11,14 +11,12 @@ MAINTAINER= johnam@mail.kemper.org HOMEPAGE= http://www.csn.ul.ie/~clernong/projects/fsviewer.html COMMENT= NextStep-like Filemanager for WindowMaker -DEPENDS+= windowmaker>=0.64.0:../../wm/windowmaker - DIST_SUBDIR= fsviewer EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} # needed for the new location of WINGs include files -- can be removed # when the application gets updated for windowmaker>=0.64.0 -CFLAGS+= -I${X11BASE}/include/WINGs +CFLAGS+= -I${BUILDLINK_DIR}/include/WINGs USE_X11BASE= yes USE_GMAKE= yes @@ -28,4 +26,5 @@ post-install: cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \ ${PAX} -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif +.include "../../wm/windowmaker/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/fsviewer/distinfo b/sysutils/fsviewer/distinfo index 520c4416c44..ff96f96f650 100644 --- a/sysutils/fsviewer/distinfo +++ b/sysutils/fsviewer/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:29:02 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/07/22 17:42:08 wiz Exp $ SHA1 (fsviewer/FSViewer.app-0.2.3.tar.gz) = 2322d2443a7505748d5b452d366d6881c7a81110 Size (fsviewer/FSViewer.app-0.2.3.tar.gz) = 203476 bytes SHA1 (fsviewer/icons.tar.gz) = 3553149133abebf526ba38795a07fa4d48fc6827 Size (fsviewer/icons.tar.gz) = 475679 bytes SHA1 (patch-aa) = 32f1bc29dc57922b716a360c208be22a4c7aba54 -SHA1 (patch-ab) = 45ba0a57aff86cdbe95c46584597fbc0bd6961cc -SHA1 (patch-ac) = df943e9b52f4cb00db6021c8a5bae73872f57cf8 -SHA1 (patch-ad) = 182921d8361198ac9c377333ebad93ca9356ca06 +SHA1 (patch-ab) = 766277775f2b7301b27fafc7259b35a30e3de4cf +SHA1 (patch-ac) = 7ac9166c7dad050ef7f9aeb9ca54154a4f034aaf +SHA1 (patch-ad) = d81cc263f985db77e4fcae5d55cfa5bb2eedc4d5 +SHA1 (patch-ae) = 7e35dd9a28622634770785d4fbfe766644c290d0 diff --git a/sysutils/fsviewer/patches/patch-ab b/sysutils/fsviewer/patches/patch-ab index 394fd317f88..5fe0ad2fd42 100644 --- a/sysutils/fsviewer/patches/patch-ab +++ b/sysutils/fsviewer/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2001/07/22 17:42:08 wiz Exp $ --- src/FSFileView.c.orig Sat Oct 9 20:45:21 1999 +++ src/FSFileView.c @@ -17,3 +17,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $ attributes.extra_flags = GSFullKeyboardEventsFlag; attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); +@@ -444,8 +444,8 @@ + WMViewSizeDidChangeNotification, + WMWidgetView(fView->fileBrowserF)); + +- WMSetWindowMiniwindowImage(fView->fileView, +- WMGetApplicationIconImage(fView->scr)); ++ WMSetWindowMiniwindowPixmap(fView->fileView, ++ WMGetApplicationIconPixmap(fView->scr)); + + array = WMGetUDObjectForKey(defaultsDB, "SHELF"); + if(array && PLIsArray(array)) diff --git a/sysutils/fsviewer/patches/patch-ac b/sysutils/fsviewer/patches/patch-ac index 13c2cd9d7f2..4be9a76eb5a 100644 --- a/sysutils/fsviewer/patches/patch-ac +++ b/sysutils/fsviewer/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2001/07/22 17:42:09 wiz Exp $ --- src/FSFinder.c.orig Sat Oct 9 20:45:24 1999 +++ src/FSFinder.c @@ -19,3 +19,14 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $ attributes.extra_flags = GSFullKeyboardEventsFlag; attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); +@@ -172,8 +172,8 @@ + WMTextDidEndEditingNotification, + finder->searchField); + +- WMSetWindowMiniwindowImage(finder->win, +- WMGetApplicationIconImage(finder->scr)); ++ WMSetWindowMiniwindowPixmap(finder->win, ++ WMGetApplicationIconPixmap(finder->scr)); + + return finder; + } diff --git a/sysutils/fsviewer/patches/patch-ad b/sysutils/fsviewer/patches/patch-ad index b1895e774b8..1385a5de7f4 100644 --- a/sysutils/fsviewer/patches/patch-ad +++ b/sysutils/fsviewer/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2001/07/22 17:42:09 wiz Exp $ --- src/FSViewer.c.orig Sat Oct 9 20:45:22 1999 +++ src/FSViewer.c @@ -39,3 +39,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $ attributes.extra_flags = GSFullKeyboardEventsFlag; attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr); +@@ -417,7 +417,7 @@ + if ((fsViewer->wmpixmap = WMCreatePixmapFromRImage(fsViewer->scr, + fsViewer->image, 0))) + { +- WMSetApplicationIconImage(fsViewer->scr, fsViewer->wmpixmap); ++ WMSetApplicationIconPixmap(fsViewer->scr, fsViewer->wmpixmap); + } + } + diff --git a/sysutils/fsviewer/patches/patch-ae b/sysutils/fsviewer/patches/patch-ae new file mode 100644 index 00000000000..83b6b8e26b6 --- /dev/null +++ b/sysutils/fsviewer/patches/patch-ae @@ -0,0 +1,37 @@ +$NetBSD: patch-ae,v 1.1 2001/07/22 17:42:09 wiz Exp $ + +--- src/FSPanel.c.orig Sat Oct 9 20:45:22 1999 ++++ src/FSPanel.c +@@ -103,7 +103,7 @@ + WMSetWindowTitle(info->win, "Info"); + WMSetWindowCloseAction(info->win, FSCloseInfoPanel, (void *) info); + +- if ((appicon = WMGetApplicationIconImage(info->scr))) ++ if ((appicon = WMGetApplicationIconPixmap(info->scr))) + { + WMSize appIconSize; + +@@ -624,13 +624,7 @@ + FSSetFSViewerConfirmWindow(app, WMWidgetXID(confirm->win)); + WMMapWidget(confirm->win); + +- while (!(confirm->done)) +- { +- XEvent event; +- +- WMNextEvent(dpy, &event); +- WMHandleEvent(&event); +- } ++ WMRunModalLoop(scr, W_VIEW(confirm->win)); + result = confirm->result; + + WMDestroyAlertPanel(confirm); +@@ -1257,7 +1251,7 @@ + + normalFont = WMSystemFontOfSize(alertPanel->scr, 10); + +- appIcon = WMGetApplicationIconImage(alertPanel->scr); ++ appIcon = WMGetApplicationIconPixmap(alertPanel->scr); + pixmapSize = WMGetPixmapSize(appIcon); + if (appIcon) + { |