Date: Mon, 4 Sep 2000 20:03:18 -0400 (EDT) From: Trevor Johnson <trevor@jpj.net> To: freebsd-gnats-submit@freebsd.org Subject: ports/21043: x11-wm/sapphire: fix copyright problem (second try) Message-ID: <Pine.BSI.4.21.0009041926320.5658-100000@blues.jpj.net>
next in thread | raw e-mail | index | archive | help
>Number: 21043
>Category: ports
>Synopsis: x11-wm/sapphire: fix copyright problem (second try)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 04 17:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Trevor Johnson
>Release: 4.1-STABLE i386
>Organization:
myself
>Environment:
only tested under
FreeBSD ws99.invalid 4.1-STABLE FreeBSD 4.1-STABLE #0: Sat Jul 29 02:55:41
UTC 2000 root@ws99.invalid:/usr/obj/usr/src/sys/TREVOR41A i386
>Description:
I'm the maintainer of the sapphire port. There are copyright problems
with the themes it installs. I described the problems in ports/20879
which was my first attempt at fixing them. I asked that that PR be closed
so I could come up with something better. Here it is. This patch removes
the extra themes from the sapphire port. I've prepared a collection of
themes which should have no copyright problems. In a moment I will submit
a separate port for the new collection. This patch mentions the proposed
sapphire-themes port in the DESCR file for sapphire. Also a
menu/default.orig file, identical to menu/default, is installed with
sapphire. On installation of the proposed sapphire-themes port, the
menu/default file will be replaced by one which contains the new themes.
On de-installation of the sapphire-themes port (or package),
menu/default.orig will be copied into menu/default so that only the stock
themes will be mentioned. This patch also adds a change which cycles
windows up or down when Alt+up cursor or Alt+down cursor are pressed. I
sent it to the sapphire-devel list on 30 July. The author of sapphire
rejected it, but added something similar to his list of planned changes.
files which should be removed:
patches/patch-ae
patches/patch-af
patches/patch-ag
patches/patch-ah
patches/patch-ai
patches/patch-aj
patches/patch-ak
patches/patch-al
patches/patch-am
patches/patch-an
patches/patch-ao
new file:
patches/patch-ap
files changed:
Makefile
files/md5
patches/patch-ad
pkg/DESCR
pkg/MESSAGE
pkg/PLIST
>How-To-Repeat:
N/A
>Fix:
Besides applying this change, it would be great if someone could remove
the theme files from the FTP archives. The files which should be removed
are everything in the sapphire/ subdirectory except
sapphire-0.14.2.tar.gz.
diff -ruN sapphire.orig/Makefile sapphire/Makefile
--- sapphire.orig/Makefile Mon Jun 19 21:10:27 2000
+++ sapphire/Makefile Mon Sep 4 22:21:01 2000
@@ -8,29 +8,19 @@
PORTNAME= sapphire
PORTVERSION= 0.14.2
CATEGORIES= x11-wm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- http://sapphire.sourceforge.net/themes/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${THEMES_SRC}
MAINTAINER= trevor@jpj.net
-RUN_DEPENDS= xsetbg:${PORTSDIR}/graphics/xli
-
DIST_SUBDIR= sapphire
USE_GMAKE= yes
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
-THEMES_SRC= atomic.tar.gz bevel.tar.gz blues.tar.gz dtheater.tar.gz \
- klamath.tar.gz metal.tar.gz nocturne.tar.gz river.tar.gz \
- sapphire.tar.gz slate.tar.gz synopsis.tar.gz
-
post-extract:
@${CP} ${WRKSRC}/data.inst ${WRKSRC}/sapphire.inst
- @${CP} ${WRKDIR}/*/*.theme ${WRKSRC}/data/themes
- @${CP} ${WRKDIR}/*/*.jpg ${WRKSRC}/data/themes
post-patch:
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sapphire.inst
@@ -39,10 +29,11 @@
${INSTALL_SCRIPT} ${WRKSRC}/sapphire.inst ${PREFIX}/bin
@${MKDIR} ${PREFIX}/share/sapphire/menu
${INSTALL_DATA} ${WRKSRC}/data/menu/default ${PREFIX}/share/sapphire/menu
+ # so the sapphire-themes port can restore the original menu when the
+ # themes are de-installed
+ ${INSTALL_DATA} ${WRKSRC}/data/menu/default ${PREFIX}/share/sapphire/menu/default.orig
@${MKDIR} ${PREFIX}/share/sapphire/themes
${INSTALL_DATA} ${WRKSRC}/data/themes/*.theme ${PREFIX}/share/sapphire/themes
- @${MKDIR} ${PREFIX}/share/sapphire/themes/backgrounds
- ${INSTALL_DATA} ${WRKSRC}/data/themes/*.jpg ${PREFIX}/share/sapphire/themes/backgrounds
@${MKDIR} ${PREFIX}/share/sapphire/wmconfig
${INSTALL_DATA} ${WRKSRC}/data/wmconfig/wmconf ${PREFIX}/share/sapphire/wmconfig
.if !defined(NOPORTDOCS)
diff -ruN sapphire.orig/files/md5 sapphire/files/md5
--- sapphire.orig/files/md5 Sun Apr 30 21:21:55 2000
+++ sapphire/files/md5 Sat Aug 26 23:59:41 2000
@@ -1,12 +1 @@
MD5 (sapphire/sapphire-0.14.2.tar.gz) = 486c33f1cc95369338a69bd7c5d2aafe
-MD5 (sapphire/atomic.tar.gz) = 91946c1930e9edccbf81110a9d9d3c45
-MD5 (sapphire/bevel.tar.gz) = 3911f81528ec43cdd9e1c9035cdc5fc0
-MD5 (sapphire/blues.tar.gz) = 48a3e242acb42886e260563bc3029fff
-MD5 (sapphire/dtheater.tar.gz) = 3adad23140cbb728f4e2a6bd5169d9b0
-MD5 (sapphire/klamath.tar.gz) = be0c66ffd2a1b8fcbe04cc4136cb0064
-MD5 (sapphire/metal.tar.gz) = 5698e04e8b46a61c557f57bb6af69492
-MD5 (sapphire/nocturne.tar.gz) = 5f11db03eee42b71fb6b361230c45db2
-MD5 (sapphire/river.tar.gz) = 4d177069374474ea9382437df025bd42
-MD5 (sapphire/sapphire.tar.gz) = 1073a89bca0949f5f17bfd5ccd375a47
-MD5 (sapphire/slate.tar.gz) = 7200b8e0637265d8336c112854ee7140
-MD5 (sapphire/synopsis.tar.gz) = ac892fc69f5da628add1d0876afc6be0
diff -ruN sapphire.orig/patches/patch-ad sapphire/patches/patch-ad
--- sapphire.orig/patches/patch-ad Sun Apr 30 21:21:56 2000
+++ sapphire/patches/patch-ad Mon Sep 4 13:23:34 2000
@@ -1,6 +1,6 @@
--- data/menu/default.orig Mon Feb 21 23:06:19 2000
+++ data/menu/default Mon Apr 10 22:06:34 2000
-@@ -38,11 +38,20 @@
+@@ -38,11 +38,11 @@
submenu (themes)
{
@@ -10,19 +10,10 @@
- theme (rose) {~/.sapphire/themes/rose.theme}
- theme (green) {~/.sapphire/themes/green.theme}
+ theme (default) {~/.sapphire/themes/default.theme}
-+ theme (atomic) {~/.sapphire/themes/atomic.theme}
-+ theme (bevel) {~/.sapphire/themes/bevel.theme}
-+ theme (blues) {~/.sapphire/themes/blues.theme}
+ theme (darkblue) {~/.sapphire/themes/darkblue.theme}
-+ theme (dtheater) {~/.sapphire/themes/dtheater.theme}
-+ theme (klamath) {~/.sapphire/themes/klamath.theme}
-+ theme (metal) {~/.sapphire/themes/metal.theme}
-+ theme (nocturne) {~/.sapphire/themes/nocturne.theme}
-+ theme (river) {~/.sapphire/themes/river.theme}
++ theme (gray) {~/.sapphire/themes/gray.theme}
+ theme (rose) {~/.sapphire/themes/rose.theme}
-+ theme (sapphire) {~/.sapphire/themes/sapphire.theme}
+ theme (slate) {~/.sapphire/themes/slate.theme}
-+ theme (synopsis) {~/.sapphire/themes/synopsis.theme}
}
separator
--- sapphire.orig/patches/patch-ap Thu Jan 1 00:00:00 1970
+++ sapphire/patches/patch-ap Mon Sep 4 23:15:37 2000
@@ -0,0 +1,43 @@
+--- src/windowmanager.cc.orig Wed Feb 23 23:26:21 2000
++++ src/windowmanager.cc Mon Sep 4 23:15:30 2000
+@@ -127,7 +127,7 @@
+ #ifdef SHAPE
+ if(! QueryShapeExtentions())
+ {
+- printf("Shape extentions not supported\n");
++ printf("Shape extensions not supported\n");
+ }
+ #endif
+
+@@ -175,6 +175,10 @@
+ t = new Toolbar();
+ im = new IconMenu();
+
++ // Grab alt+up cursor and alt+down cursor for cycling windows in
++ // WindowManager::do_event_loop().
++ XGrabKey(dpy, XKeysymToKeycode(dpy, XK_Up), Mod1Mask, root, True, GrabModeAsync, GrabModeAsync);
++ XGrabKey(dpy, XKeysymToKeycode(dpy, XK_Down), Mod1Mask, root, True, GrabModeAsync, GrabModeAsync);
+ addToMenuList(rm);
+ rm->parseMenuConfigurationFile();
+
+@@ -511,6 +515,20 @@
+ head_client->handle_reparent_event(&ev.xreparent);
+
+ break;
++ }
++
++ case KeyPress:
++ {
++ if (XKeycodeToKeysym(dpy, ev.xkey.keycode, 0) == XK_Up)
++ {
++ XCirculateSubwindowsUp(wm->getDisplay(), wm->getRootWindow());
++ break;
++ }
++ if (XKeycodeToKeysym(dpy, ev.xkey.keycode, 0) == XK_Down)
++ {
++ XCirculateSubwindowsDown(wm->getDisplay(), wm->getRootWindow());
++ break;
++ }
+ }
+
+ default:
diff -ruN sapphire.orig/pkg/DESCR sapphire/pkg/DESCR
--- sapphire.orig/pkg/DESCR Sun Apr 30 21:21:59 2000
+++ sapphire/pkg/DESCR Mon Sep 4 23:19:58 2000
@@ -1,8 +1,12 @@
Sapphire is a small window manager based on aewm and blackbox.
Windows can be rolled up or hidden. Programs can be run from a
-menu. A clock and calendar are built in. This port installs
-both sapphire itelf and all the themes from its Web site, except
-"linux" and "linuxturf".
+menu. A clock and calendar are built in.
+
+This version of sapphire incorporates a patch which cycles windows
+up or down when Alt+up cursor or Alt+down cursor are pressed.
+
+If you like this window manager, you may wish to install the
+sapphire-themes package to accompany it.
WWW: http://sapphire.sourceforge.net/
diff -ruN sapphire.orig/pkg/MESSAGE sapphire/pkg/MESSAGE
--- sapphire.orig/pkg/MESSAGE Sun Apr 30 21:22:00 2000
+++ sapphire/pkg/MESSAGE Mon Sep 4 22:27:00 2000
@@ -1,3 +1,4 @@
-
-Before running sapphire, users should run sapphire.inst, even if they ran
-it for an earlier version. Otherwise sapphire is likely to crash.
+*****************************************************************************
+* Before running sapphire, users should run sapphire.inst, even if they ran *
+* it for an earlier version. Otherwise sapphire is likely to crash. *
+*****************************************************************************
diff -ruN sapphire.orig/pkg/PLIST sapphire/pkg/PLIST
--- sapphire.orig/pkg/PLIST Sun Apr 30 21:22:00 2000
+++ sapphire/pkg/PLIST Mon Sep 4 22:20:11 2000
@@ -2,36 +2,15 @@
bin/sapphire.inst
share/doc/sapphire/README
share/sapphire/menu/default
-share/sapphire/themes/atomic.theme
-share/sapphire/themes/backgrounds/atomic.jpg
-share/sapphire/themes/backgrounds/bevel.jpg
-share/sapphire/themes/backgrounds/blues.jpg
-share/sapphire/themes/backgrounds/dtheater.jpg
-share/sapphire/themes/backgrounds/klamath.jpg
-share/sapphire/themes/backgrounds/metal.jpg
-share/sapphire/themes/backgrounds/nocturne.jpg
-share/sapphire/themes/backgrounds/river.jpg
-share/sapphire/themes/backgrounds/sapphire.jpg
-share/sapphire/themes/backgrounds/slate.jpg
-share/sapphire/themes/backgrounds/synopsis.jpg
-share/sapphire/themes/bevel.theme
-share/sapphire/themes/blues.theme
+share/sapphire/menu/default.orig
share/sapphire/themes/darkblue.theme
share/sapphire/themes/default.theme
-share/sapphire/themes/dtheater.theme
share/sapphire/themes/gray.theme
-share/sapphire/themes/klamath.theme
-share/sapphire/themes/metal.theme
-share/sapphire/themes/nocturne.theme
-share/sapphire/themes/river.theme
share/sapphire/themes/rose.theme
-share/sapphire/themes/sapphire.theme
share/sapphire/themes/slate.theme
-share/sapphire/themes/synopsis.theme
share/sapphire/wmconfig/wmconf
@dirrm share/doc/sapphire
@dirrm share/sapphire/menu
-@dirrm share/sapphire/themes/backgrounds
@dirrm share/sapphire/themes
@dirrm share/sapphire/wmconfig
@dirrm share/sapphire
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSI.4.21.0009041926320.5658-100000>