diff options
author | wiz <wiz@pkgsrc.org> | 2011-08-06 17:09:03 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-08-06 17:09:03 +0000 |
commit | ec56c869d3e65e18785d34c91a5a6047428a9aaa (patch) | |
tree | 206a89c19e0e929d0cdb4782536f9984616f1eac /wm | |
parent | 59350c759932c3d5881ebcb6b18a3864325f6135 (diff) | |
download | pkgsrc-ec56c869d3e65e18785d34c91a5a6047428a9aaa.tar.gz |
Update to 3.5 and add comments to patches.
3.5.0:
* New alt-tab dialog shows windows in a vertical list.
* Improved Xinerama support.
* Allow icons in menus.
* Theme options for prompt dialogs (osd.button.unpressed.*,
osd.button.pressed.*, osd.button.focused.*)
* Addresses bug #4877, #4596, #4617, #4752, #4663, #4662, #4586, #2319,
#4341, #4519, #4543, #4503, #4355, #4072, #3702, #4284
* Lots of additional bug fixes and performance improvements.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/openbox/Makefile | 19 | ||||
-rw-r--r-- | wm/openbox/PLIST | 46 | ||||
-rw-r--r-- | wm/openbox/distinfo | 12 | ||||
-rw-r--r-- | wm/openbox/patches/patch-aa | 84 | ||||
-rw-r--r-- | wm/openbox/patches/patch-ab | 6 |
5 files changed, 106 insertions, 61 deletions
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index dcfdf48f51d..7c07a2bc32c 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2011/05/02 12:54:13 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2011/08/06 17:09:03 wiz Exp $ -DISTNAME= openbox-3.4.11.2 -PKGREVISION= 5 +DISTNAME= openbox-3.5.0 CATEGORIES= wm x11 MASTER_SITES= http://openbox.org/dist/openbox/ @@ -20,8 +19,8 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_FEATURES+= setenv -PKGCONFIG_OVERRIDE= parser/obparser-3.0.pc.in -PKGCONFIG_OVERRIDE+= render/obrender-3.0.pc.in +PKGCONFIG_OVERRIDE= obrender/obrender-3.5.pc.in +PKGCONFIG_OVERRIDE+= obt/obt-3.5.pc.in CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} LDFLAGS+= ${BUILDLINK_LDADD.libsetenv} @@ -30,19 +29,19 @@ OWN_DIRS= ${PKG_SYSCONFDIR} OWN_DIRS+= ${PKG_SYSCONFDIR}/openbox EGDIR= ${PREFIX}/share/examples/openbox -CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml +CONF_FILES= ${EGDIR}/autostart ${PKG_SYSCONFDIR}/openbox/autostart +CONF_FILES+= ${EGDIR}/environment ${PKG_SYSCONFDIR}/openbox/environment +CONF_FILES+= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml -CONF_FILES+= ${EGDIR}/autostart.sh \ - ${PKG_SYSCONFDIR}/openbox/autostart.sh SUBST_CLASSES+= python SUBST_STAGE.python= pre-build -SUBST_FILES.python+= tools/xdg-autostart/xdg-autostart +SUBST_FILES.python+= data/autostart/openbox-xdg-autostart # Best we can do without pulling in a python dependency. # Update when PYTHON_VERSION_DEFAULT changes! SUBST_SED.python+= -e 's,/usr/bin/env.*python,${PREFIX}/bin/python2.6,' SUBST_MESSAGE.python= Fixing path to python. -CHECK_INTERPRETER_SKIP= lib/openbox/xdg-autostart +CHECK_INTERPRETER_SKIP= libexec/openbox-xdg-autostart BUILDLINK_DEPMETHOD.libXt?= build diff --git a/wm/openbox/PLIST b/wm/openbox/PLIST index 0bdaa0d4758..69958dc78f2 100644 --- a/wm/openbox/PLIST +++ b/wm/openbox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2010/02/16 13:43:09 wiz Exp $ +@comment $NetBSD: PLIST,v 1.24 2011/08/06 17:09:03 wiz Exp $ bin/gdm-control bin/gnome-panel-control bin/obxprop @@ -6,22 +6,32 @@ bin/openbox bin/openbox-gnome-session bin/openbox-kde-session bin/openbox-session -include/openbox/${PKGVERSION}/openbox/color.h -include/openbox/${PKGVERSION}/openbox/font.h -include/openbox/${PKGVERSION}/openbox/geom.h -include/openbox/${PKGVERSION}/openbox/gradient.h -include/openbox/${PKGVERSION}/openbox/image.h -include/openbox/${PKGVERSION}/openbox/instance.h -include/openbox/${PKGVERSION}/openbox/mask.h -include/openbox/${PKGVERSION}/openbox/parse.h -include/openbox/${PKGVERSION}/openbox/render.h -include/openbox/${PKGVERSION}/openbox/theme.h -include/openbox/${PKGVERSION}/openbox/version.h -lib/libobparser.la +include/openbox/3.5/obrender/color.h +include/openbox/3.5/obrender/font.h +include/openbox/3.5/obrender/geom.h +include/openbox/3.5/obrender/gradient.h +include/openbox/3.5/obrender/image.h +include/openbox/3.5/obrender/instance.h +include/openbox/3.5/obrender/mask.h +include/openbox/3.5/obrender/render.h +include/openbox/3.5/obrender/theme.h +include/openbox/3.5/obrender/version.h +include/openbox/3.5/obt/display.h +include/openbox/3.5/obt/keyboard.h +include/openbox/3.5/obt/link.h +include/openbox/3.5/obt/paths.h +include/openbox/3.5/obt/prop.h +include/openbox/3.5/obt/signal.h +include/openbox/3.5/obt/util.h +include/openbox/3.5/obt/version.h +include/openbox/3.5/obt/xml.h +include/openbox/3.5/obt/xqueue.h lib/libobrender.la -lib/openbox/xdg-autostart -lib/pkgconfig/obparser-3.0.pc -lib/pkgconfig/obrender-3.0.pc +lib/libobt.la +lib/pkgconfig/obrender-3.5.pc +lib/pkgconfig/obt-3.5.pc +libexec/openbox-autostart +libexec/openbox-xdg-autostart man/man1/obxprop.1 man/man1/openbox-gnome-session.1 man/man1/openbox-kde-session.1 @@ -45,7 +55,8 @@ share/doc/openbox/xbm/max.xbm share/doc/openbox/xbm/max_toggled.xbm share/doc/openbox/xbm/shade.xbm share/doc/openbox/xbm/shade_toggled.xbm -share/examples/openbox/autostart.sh +share/examples/openbox/autostart +share/examples/openbox/environment share/examples/openbox/menu.xml share/examples/openbox/rc.xml share/gnome/wm-properties/openbox.desktop @@ -97,6 +108,7 @@ share/themes/Bear2/openbox-3/max_toggled.xbm share/themes/Bear2/openbox-3/shade.xbm share/themes/Bear2/openbox-3/shade_pressed.xbm share/themes/Bear2/openbox-3/themerc +share/themes/Clearlooks-3.4/openbox-3/themerc share/themes/Clearlooks-Olive/openbox-3/themerc share/themes/Clearlooks/openbox-3/themerc share/themes/Mikachu/openbox-3/bullet.xbm diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo index ea223303964..44bdbf4c00a 100644 --- a/wm/openbox/distinfo +++ b/wm/openbox/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.27 2010/06/05 11:43:51 wiz Exp $ +$NetBSD: distinfo,v 1.28 2011/08/06 17:09:03 wiz Exp $ -SHA1 (openbox-3.4.11.2.tar.gz) = e9eb2d91b3aea54158d0ce38694896e5669a7610 -RMD160 (openbox-3.4.11.2.tar.gz) = d1e2c0d48986dfdf916b374095c20f354f6c663c -Size (openbox-3.4.11.2.tar.gz) = 877633 bytes -SHA1 (patch-aa) = ca108ec682a613182eab42ddcd19c614375b4952 -SHA1 (patch-ab) = bb13ec5801c2e271f1e6b2dc4d0aa149c9e2dff1 +SHA1 (openbox-3.5.0.tar.gz) = 3c3b8d2bc4f4e229871254e92d6b18639be00302 +RMD160 (openbox-3.5.0.tar.gz) = af79a5e8b11f3605a9d3906ed6256ce4102effd5 +Size (openbox-3.5.0.tar.gz) = 911834 bytes +SHA1 (patch-aa) = 72aa51ec36cd740d5b2d8a9f173442c5bd8312ba +SHA1 (patch-ab) = e6d837a3f74deacdb9ebbf813b7f86497fa34fa9 diff --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa index 4fbc9faca9e..0c5b148554d 100644 --- a/wm/openbox/patches/patch-aa +++ b/wm/openbox/patches/patch-aa @@ -1,8 +1,11 @@ -$NetBSD: patch-aa,v 1.10 2010/05/02 10:37:07 wiz Exp $ +$NetBSD: patch-aa,v 1.11 2011/08/06 17:09:04 wiz Exp $ ---- Makefile.in.orig 2010-03-26 01:16:44.000000000 +0000 +Install config files into examples directory (and use CONF_FILES +to handle them). + +--- Makefile.in.orig 2011-08-01 20:15:35.000000000 +0000 +++ Makefile.in -@@ -484,7 +484,7 @@ target_alias = @target_alias@ +@@ -542,7 +542,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = m4 po docxbmdir = $(docdir)/xbm themedir = $(datadir)/themes @@ -11,35 +14,62 @@ $NetBSD: patch-aa,v 1.10 2010/05/02 10:37:07 wiz Exp $ rcdir = $(configdir)/openbox xsessionsdir = $(datadir)/xsessions gnomewmfilesdir = $(datadir)/gnome/wm-properties -@@ -3160,12 +3160,12 @@ uninstall-dist_pixmapDATA: - done - install-dist_rcDATA: $(dist_rc_DATA) +@@ -1534,7 +1534,7 @@ uninstall-dist_libexecSCRIPTS: + cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + install-dist_rcSCRIPTS: $(dist_rc_SCRIPTS) @$(NORMAL_INSTALL) -- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)" +- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)" + $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox - @list='$(dist_rc_DATA)'; for p in $$list; do \ + @list='$(dist_rc_SCRIPTS)'; test -n "$(rcdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(dist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \ -- $(dist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \ -+ echo " $(dist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/openbox/$$f'"; \ -+ $(dist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/openbox/$$f"; \ - done +@@ -1553,8 +1553,8 @@ install-dist_rcSCRIPTS: $(dist_rc_SCRIPT + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ +- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(rcdir)$$dir'"; \ +- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(rcdir)$$dir" || exit $$?; \ ++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(datadir)/examples/openbox/$$dir'"; \ ++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(datadir)/examples/openbox/$$dir" || exit $$?; \ + } \ + ; done - uninstall-dist_rcDATA: -@@ -3211,12 +3211,12 @@ uninstall-nodist_pkgconfigDATA: - done - install-nodist_rcDATA: $(nodist_rc_DATA) +@@ -1636,7 +1636,7 @@ uninstall-nodist_libexecSCRIPTS: + cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + install-nodist_rcSCRIPTS: $(nodist_rc_SCRIPTS) @$(NORMAL_INSTALL) -- test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)" -+ $(mkinstalldirs) "$(DESTDIR)$(datadir)/examples/openbox" - @list='$(nodist_rc_DATA)'; for p in $$list; do \ +- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)" ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox + @list='$(nodist_rc_SCRIPTS)'; test -n "$(rcdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ -- echo " $(nodist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \ -- $(nodist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \ -+ echo " $(nodist_rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/openbox/$$f'"; \ -+ $(nodist_rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/openbox/$$f"; \ +@@ -1655,8 +1655,8 @@ install-nodist_rcSCRIPTS: $(nodist_rc_SC + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ +- echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(rcdir)$$dir'"; \ +- $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(rcdir)$$dir" || exit $$?; \ ++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(datadir)/examples/openbox/$$dir'"; \ ++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(datadir)/examples/openbox/$$dir" || exit $$?; \ + } \ + ; done + +@@ -3482,15 +3482,15 @@ uninstall-dist_pixmapDATA: + cd "$(DESTDIR)$(pixmapdir)" && rm -f $$files + install-dist_rcDATA: $(dist_rc_DATA) + @$(NORMAL_INSTALL) +- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)" ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/openbox + @list='$(dist_rc_DATA)'; test -n "$(rcdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(rcdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(rcdir)" || exit $$?; \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples/openbox'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/openbox" || exit $$?; \ done - uninstall-nodist_rcDATA: + uninstall-dist_rcDATA: diff --git a/wm/openbox/patches/patch-ab b/wm/openbox/patches/patch-ab index cd018bcb834..a0f30fb665b 100644 --- a/wm/openbox/patches/patch-ab +++ b/wm/openbox/patches/patch-ab @@ -1,4 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2007/07/30 13:58:28 tnn Exp $ +$NetBSD: patch-ab,v 1.5 2011/08/06 17:09:04 wiz Exp $ + +Attempt to fix two problems seen with the installation of translation files: + - Don't be explicit about using a shell interpreter for install_sh. + - use $(mkinstalldirs) as the "mkdir -p" replacement. --- po/Makefile.in.in.orig 2007-07-13 16:21:27.000000000 +0200 +++ po/Makefile.in.in |