commit: fbff0b62bb6a91011372db2490a226c78e4ec19e Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Fri Jun 2 22:28:35 2017 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Fri Jun 2 22:28:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbff0b62
x11-wm/windowmaker: drop old Package-Manager: Portage-2.3.6, Repoman-2.3.2 x11-wm/windowmaker/Manifest | 2 - .../windowmaker-0.95.3-fix_underlinking.patch | 15 --- .../files/windowmaker-0.95.5-bsd_crash.patch | 28 ------ .../files/windowmaker-0.95.6-webp_detection.patch | 70 ------------- x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild | 108 -------------------- x11-wm/windowmaker/windowmaker-0.95.6.ebuild | 111 --------------------- x11-wm/windowmaker/windowmaker-0.95.8.ebuild | 106 -------------------- 7 files changed, 440 deletions(-) diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 5ddd0e5e48f..d680f7617dc 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,5 +1,3 @@ -DIST WindowMaker-0.95.5.tar.gz 2927995 SHA256 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 SHA512 0a6eb7c3ffee1d09dbc2408be4d2c04f6647cd1195366047083b5c5c89b61e92a5c7d5d134e43775fc371ea27ac8645ad0a7cbae86ebd53f2eae20066ac56703 WHIRLPOOL eb41cffab165af4efb66b28aacbc0e4695d57a426565554f20566b02bb0f428c31e23ec50af36759992a9a18f1598a727f98168d6bde7443f58821101d1653da -DIST WindowMaker-0.95.6.tar.gz 3004856 SHA256 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4 SHA512 259db96b44058fde21b7efe65419b7f7ae149029dcfbf5cf480f920d68f906cd15345105ab67d8539be44d6f1b30e62accf68fc009d53af8c12e047c01154a11 WHIRLPOOL 6f27180cc4439b4b19c3f249fc9c5577463187c741c2e04112bb70feb8e052ad1093e0a5103f1772b59ee7b2549f7b126ac621165f94483e22fd756a969e0e3c DIST WindowMaker-0.95.7.tar.gz 3238325 SHA256 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f WHIRLPOOL 090efc24fe47487b5f9ec68e821b0fea789ac4f7badccf639a5910f463613381701c6750db29f98e6777207387850e0c47324ffc8fcc1d1b4fe60ac05c05c25d DIST WindowMaker-0.95.8.tar.gz 3253515 SHA256 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2 WHIRLPOOL e5027c70637b0a9204b9e71054a0351389fcb5c2773c8dbc1e7c15285a6e6caeaf6c04456b6d5fa7f4510abe0da4872db8a8bd870b78ef6369aaf9e81197b553 DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034 diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch b/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch deleted file mode 100644 index cd88709dc14..00000000000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am -index 0f8201f..7b95d1f 100644 ---- a/wmlib/Makefile.am -+++ b/wmlib/Makefile.am -@@ -2,6 +2,7 @@ - AUTOMAKE_OPTIONS = no-dependencies - - libWMaker_la_LDFLAGS = -version-info 1:1:0 -+libWMaker_la_LIBADD = @LIBRARY_SEARCH_PATH@ @XLIBS@ - lib_LTLIBRARIES = libWMaker.la - - include_HEADERS = WMaker.h --- -1.7.8.6 - diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch b/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch deleted file mode 100644 index a3e71375f62..00000000000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: François Tigeot <ftig...@wolfpond.org> -Date: Sat, 21 Sep 2013 10:34:51 +0000 (+0200) -Subject: osdep_bsd.c: Fix a typo causing memory to be overwritten -X-Git-Url: http://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/38e088314a2a4b7f8031f50eb546c22e5024bdf4 - -osdep_bsd.c: Fix a typo causing memory to be overwritten - -* When compiled on DragonFly+gcc 4.7.3, this out of bounds array element - initialization causes an important variable to be overwritten and a - subsequent WindowMaker crash - -* It was sheer luck other compilers/environments didn't exhibit any obvious - issue so far ---- - -diff --git a/src/osdep_bsd.c b/src/osdep_bsd.c -index 3393240..ad504ad 100644 ---- a/src/osdep_bsd.c -+++ b/src/osdep_bsd.c -@@ -86,7 +86,7 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc) - mib[0] = CTL_KERN; - mib[1] = KERN_ARGMAX; - mib[2] = 0; -- mib[4] = 0; -+ mib[3] = 0; - - count = sizeof(argmax); - if (sysctl(mib, 2, &argmax, &count, NULL, 0) == -1) diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch b/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch deleted file mode 100644 index a451486288f..00000000000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch +++ /dev/null @@ -1,70 +0,0 @@ -From e1146e56e08af2a66aecedffc6ff31d8ddcb25f3 Mon Sep 17 00:00:00 2001 -From: Christophe CURIS <christophe.cu...@free.fr> -Date: Mon, 15 Dec 2014 23:49:29 +0100 -Subject: [PATCH] configure: rewrote the detection for WebP image library - -Unfortunately, the detection was broken because the header is using a hack -on the function name to provide compatibility between different versions of -the API, which means the usual link test, which uses a known name of a -symbol, cannot work without also using the header to get the hack applied -on the function's name. - -The new detection mechanism now simply check for both header and link at -the same time, so we're probably safe until a Major API change is decided, -in which case we will also have to update WRaster's code anyway. - -Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> ---- - m4/wm_imgfmt_check.m4 | 36 ++++++++++++++++++++++++++++-------- - 1 files changed, 28 insertions(+), 8 deletions(-) - -diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4 -index cad2d72..d07e618 100644 ---- a/m4/wm_imgfmt_check.m4 -+++ b/m4/wm_imgfmt_check.m4 -@@ -187,14 +187,34 @@ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_TIFF], - # the variable 'supported_gfx' - # When not found, append info to variable 'unsupported' - AC_DEFUN_ONCE([WM_IMGFMT_CHECK_WEBP], --[WM_LIB_CHECK([WEBP], ["-lwebp"], [VP8DecodeLayer], [$XLFLAGS $XLIBS], -- [wm_save_CFLAGS="$CFLAGS" -- AS_IF([wm_fn_lib_try_compile "webp/decode.h" "" "return 0" ""], -- [], -- [AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header - are you missing libwebp-dev package?])]) -- CFLAGS="$wm_save_CFLAGS"], -- [supported_gfx], [GFXLIBS])dnl --]) dnl AC_DEFUN -+[AS_IF([test "x$enable_webp" = "xno"], -+ [unsupported="$unsupported WebP"], -+ [AC_CACHE_CHECK([for WebP support library], [wm_cv_imgfmt_webp], -+ [wm_cv_imgfmt_webp=no -+ dnl -+ dnl The library is using a special trick on the functions to provide -+ dnl compatibility between versions, so we cannot try linking against -+ dnl a symbol without first using the header to handle it -+ wm_save_LIBS="$LIBS" -+ LIBS="$LIBS -lwebp" -+ AC_TRY_LINK( -+ [@%:@include <webp/decode.h>], -+ [WebPGetFeatures(NULL, 1024, NULL);], -+ [wm_cv_imgfmt_webp="-lwebp"]) -+ LIBS="$wm_save_LIBS" -+ AS_IF([test "x$enable_webp$wm_cv_imgfmt_webp" = "xyesno"], -+ [AC_MSG_ERROR([explicit WebP support requested but no library found])])dnl -+ ]) -+ AS_IF([test "x$wm_cv_imgfmt_webp" = "xno"], -+ [unsupported="$unsupported WebP" -+ enable_webp="no"], -+ [supported_gfx="$supported_gfx WebP" -+ WM_APPEND_ONCE([$wm_cv_imgfmt_webp], [GFXLIBS])dnl -+ AC_DEFINE([USE_WEBP], [1], -+ [defined when valid Webp library with header was found])])dnl -+ ]) -+AM_CONDITIONAL([USE_WEBP], [test "x$enable_webp" != "xno"])dnl -+]) - - - # WM_IMGFMT_CHECK_XPM --- -1.7.6.6.GIT - diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild deleted file mode 100644 index 8d9121fcf31..00000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.5-r2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/"; -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif jpeg nls png tiff modelock xinerama xrandr" -KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3:0= ) - png? ( media-libs/libpng:0= ) - jpeg? ( virtual/jpeg:0= ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 ) - !app-i18n/scim-anthy[gtk3] -" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - fi; - done; - - epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch - epatch "${FILESDIR}"/${P}-bsd_crash.patch - eautoreconf -} - -src_configure() { - local myconf - - # image format types - myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild deleted file mode 100644 index 00222e46040..00000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/"; -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( media-gfx/imagemagick ) - jpeg? ( virtual/jpeg:0= ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - webp? ( media-libs/libwebp ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 ) - !app-i18n/scim-anthy[gtk3] -" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - fi; - done; - - epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch - epatch "${FILESDIR}"/${P}-webp_detection.patch - - eautoreconf -} - -src_configure() { - local myconf - - # image format types - myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.95.8.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8.ebuild deleted file mode 100644 index 066d5ac0a91..00000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.8.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/"; -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"; - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( media-gfx/imagemagick ) - jpeg? ( virtual/jpeg:0= ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - webp? ( media-libs/libwebp ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - fi; - done; - - default -} - -src_configure() { - local myconf - - # image format types - myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --localedir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -}
