[gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/files/, x11-misc/xlockmore/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/files/, x11-misc/xlockmore/
@ 2016-05-14 10:47 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-05-14 10:47 UTC (permalink / raw
  To: gentoo-commits

commit:     5ed531e50ec8f10a6b8dd096468ac176ffec0ccc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 10:43:16 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 14 10:47:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed531e5

x11-misc/xlockmore: Version bump.

Package-Manager: portage-2.2.28

 x11-misc/xlockmore/Manifest                        |   1 +
 x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch  |  19 ++++
 .../files/xlockmore-5.47-_BSD_SOURCE.patch         |  11 +++
 .../xlockmore/files/xlockmore-5.47-strip.patch     |  64 ++++++++++++
 x11-misc/xlockmore/metadata.xml                    |   1 +
 x11-misc/xlockmore/xlockmore-5.47.ebuild           | 107 +++++++++++++++++++++
 6 files changed, 203 insertions(+)

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index bf1002f..0d080d3 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,2 +1,3 @@
 DIST xlockmore-5.45.tar.bz2 1968176 SHA256 7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7 SHA512 ab7ad1d1a066176cb8fb77d8c93181dad437b75d1c163f3ea49892477b4a4404129ce169d2fa38f131272a0a8b834ea61c88dd8bb8963d9dfed21c41af120fde WHIRLPOOL 2e890583c6105808821ae447e136fcea4cc782a4eb5a8e55f67195f91a0db23a9121e5bf53e9046139f3cc59e5d7d38ec97a42ce0c31df573674b3644c548cd7
 DIST xlockmore-5.46.tar.xz 1610356 SHA256 32b3be122c4fde5ae70dba5899bbcc20cd7e80119e246d79455d84046d6d40df SHA512 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413ba3983c4ced778c9d4e6dfa40a4c7919557b3fa7ecccba08e1a0bb0403924fa84770401d6758c7d9c WHIRLPOOL 6bfd885cb6e460ccbb2ebd682d2096e454c4a5ccb58244495451973bd16d5410f3ba347afdba6c747a34a50bcb1612bae5fa16f1c09f54f2f82c1257ed59105d
+DIST xlockmore-5.47.tar.xz 1610604 SHA256 94e3adee284eec09dc27405bfc24651446e8c6edd6a5bc565550b08f563a0d8d SHA512 0690255cafa0e32d5b2920a611a76107565591331ef12e442069d4a7fba38b18b43a581f29488969695390aef92d4868681efb9b2a06fbb73960d4bcd4b13484 WHIRLPOOL c76dd5c9111d7e17fcbf4572d95773fd40b14f3895fb5b2e86aa36bc2b15da0b6d1fc5bcbf776da976113a76c7f14caf2507495359e0f8a15996cf574c498903

diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch b/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch
new file mode 100644
index 0000000..0617c51
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,11 +10,11 @@
+ AC_PROG_CC
+ dnl Check if C++ compiler is present. If not set CXX to the C-compiler used
+ dnl for the other compilations.
+-if test "$CC" = gcc; then
+-  AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
+-else
+-  AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
+-fi
++dnl if test "$CC" = gcc; then
++dnl   AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
++dnl else
++dnl   AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
++dnl fi
+ AC_PROG_CXX
+ if test "${CXX}" = "xlC" ; then
+   CXXFLAGS="${CXXFLAGS} -+"

diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch b/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch
new file mode 100644
index 0000000..9d88a34
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3946,7 +3946,7 @@
+     AC_DEFINE([linux], [1], [Linux OS])
+ dnl    AC_DEFINE([__i386__], [1], [Intel 386 machine])
+     AC_DEFINE([_POSIX_SOURCE], [1], [POSIX source])
+-    AC_DEFINE([_BSD_SOURCE], [1], [BSD source])
++    AC_DEFINE([_DEFAULT_SOURCE], [1], [DEFAULT source])
+     AC_DEFINE([_GNU_SOURCE], [1], [GNU source])
+ dnl    AC_DEFINE([DX_LOCALE], [1], [DX Locale])
+     if test -e /etc/shadow ; then

diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch b/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch
new file mode 100644
index 0000000..e2d7625
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3895,7 +3895,7 @@
+     BITMAPTYPE="bsd"
+     PIXMAPTYPE="bsd"
+     FORTUNE=""
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     cpp_name=`echo $CC | cut -f1 -d' '`
+     if test "$cpp_name" = "gcc"; then
+         dirname=`which gcc`
+@@ -3960,7 +3960,6 @@
+           ;;
+       esac
+     fi
+-    INSTPGMFLAGS="-s $INSTPGMFLAGS"
+     BITMAPTYPE="linux"
+     PIXMAPTYPE="linux"
+ dnl if Shadow and not elf
+@@ -3985,7 +3984,7 @@
+         AC_SUBST(OSF1_ENH_SEC)
+         XLOCKLIBS="${XLOCKLIBS} -lsecurity"
+         # SETGID auth may not be enough for Tru64 5.x.
+-        INSTPGMFLAGS="-s -g auth -m 2111"
++        INSTPGMFLAGS="-g auth -m 2111"
+       else
+         AC_MSG_RESULT(no)
+       fi
+@@ -4011,7 +4010,7 @@
+         PIXMAPTYPE="sol"
+       ;;
+     esac
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     AC_DEFINE([HAVE_SHADOW], [1], [Shadow passwording])
+     AC_DEFINE([SYSV], [1], [System 5])
+     AC_DEFINE([SVR4], [1], [System 5 Release 4])
+@@ -4040,7 +4039,7 @@
+   ;;
+ 
+   *-*-sysv5* )
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     AC_DEFINE([HAVE_SHADOW], [1], [Shadow passwording])
+     AC_DEFINE([SYSV], [1], [System 5])
+     AC_DEFINE([SVR4], [1], [System 5 Release 4])
+@@ -4820,7 +4819,7 @@
+   case ${canonical} in
+   *-*-linux*)
+     if test "$vtlock" = "yes"; then
+-      INSTPGMFLAGS="-s -o root -g bin -m 4111"
++      INSTPGMFLAGS="-o root -g bin -m 4111"
+       AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS" for vtlock])
+        echo "experimental: Big buffer overrun security risk"
+     else
+@@ -4838,7 +4837,7 @@
+   case ${canonical} in
+   *-*-linux*)
+     if test "$vtlock" = "yes"; then
+-      INSTPGMFLAGS="-s -o root -g bin -m 4111"
++      INSTPGMFLAGS="-o root -g bin -m 4111"
+       AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS" for vtlock])
+     else
+   AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS"])

diff --git a/x11-misc/xlockmore/metadata.xml b/x11-misc/xlockmore/metadata.xml
index 9f3a1ef..673b683 100644
--- a/x11-misc/xlockmore/metadata.xml
+++ b/x11-misc/xlockmore/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="xlockrc">Enables xlockrc for people without PAM</flag>
+    <flag name="vtlock">Enables support for virtual terminal locking</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-misc/xlockmore/xlockmore-5.47.ebuild b/x11-misc/xlockmore/xlockmore-5.47.ebuild
new file mode 100644
index 0000000..6f246b1
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.47.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
+SRC_URI="http://www.tux.org/~bagleyd/xlock/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-_BSD_SOURCE.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-flags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	econf \
+		$(use_enable pam) \
+		$(use_enable xlockrc) \
+		$(use_enable vtlock) \
+		$(use_with crypt) \
+		$(use_with debug editres) \
+		$(use_with gtk gtk2) \
+		$(use_with imagemagick magick) \
+		$(use_with motif) \
+		$(use_with nas) \
+		$(use_with opengl mesa) \
+		$(use_with opengl) \
+		$(use_with truetype freetype) \
+		$(use_with truetype ttf) \
+		$(use_with xinerama) \
+		--disable-mb \
+		--enable-appdefaultdir=/usr/share/X11/app-defaults \
+		--enable-syslog \
+		--enable-vtlock \
+		--without-esound \
+		--without-gtk \
+		${myconf[@]}
+}
+
+src_install() {
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
+	docinto html
+	dodoc docs/xlock.html
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/files/, x11-misc/xlockmore/
@ 2019-06-20  9:19 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2019-06-20  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a7ea5a778e5d77c05124b3eb221e3f2b385f99c8
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 09:19:02 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 09:19:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7ea5a77

x11-misc/xlockmore: Old

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/xlockmore/Manifest                        |   1 -
 .../xlockmore/files/xlockmore-5.55-soundpath.patch |  19 ----
 x11-misc/xlockmore/xlockmore-5.55.ebuild           | 108 ---------------------
 3 files changed, 128 deletions(-)

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index b8e55142cc8..4f33ee3a57f 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,5 +1,4 @@
 DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.55.tar.xz 1650116 BLAKE2B 4c50f9a0f4f4c5d02c002363e75eef22b19f52cb05db305f013bb105d47f3981b00f65ee66937c9bb7d971772cda90e2565345fff25fb8c593cdeefa0cf10ca7 SHA512 b6d322bbfbf5710c0fb94da6ee894902fe6c2c87f949c80a27f7924c26a20ede5a3bc40a085c00d4a41dae450c862edaa4d50f716bf3041668d89c7c1d8b4902
 DIST xlockmore-5.56.tar.xz 1649808 BLAKE2B 82d56a3570bd1be52014503d7c0a36cf27f68aaf31fe4a7ed06159dc796dbd1410711a56fa8e72709499b1ceb3063b2acd9646ba38400669d3671d04e9fb5745 SHA512 1ae5cde5d0167897229e9cb8ebd15e26fdeadc9b0e2d221e6334980f23403385bf1adbd44a955b455e3ecdf8b02b18b0e06273d8dc566b17ac3692ee5ae44f4d
 DIST xlockmore-5.57.tar.xz 1835880 BLAKE2B b26a9792286ded7647c816b907107b9c524ddbf46afab94c5b6b5dc5d5c918f5715c914ce4246497018bd56fd11329bcd1afe07608e44a70d24dd2c4c3d97e38 SHA512 2107efc7e1e9c811b6f86e9bb048dae3861a4e2f421b3d963856a77746834c08c5d349dc15cb3bc9b9aaf21abdc8f0e4af9463a90359b575604f3393c325400f

diff --git a/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch
deleted file mode 100644
index 81163e69f4a..00000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/modes/Makefile.in
-+++ b/modes/Makefile.in
-@@ -623,11 +623,11 @@
- install-sound :
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	@NOPLAY@$(INSTALL_PROGRAM) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
--	$(top_srcdir)/mkinstalldirs $(SOUNDPATH)
--	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(SOUNDPATH)
--	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(SOUNDPATH)
--	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(SOUNDPATH)
--	$(INSTALL_DATA) $(SOUNDDIR)thank-you.au $(SOUNDPATH)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
-+	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
-+	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
-+	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)
-+	$(INSTALL_DATA) $(SOUNDDIR)thank-you.au $(DESTDIR)$(SOUNDPATH)
- 
- uninstall : uninstall-program uninstall-man uninstall-ad uninstall-sound
- 

diff --git a/x11-misc/xlockmore/xlockmore-5.55.ebuild b/x11-misc/xlockmore/xlockmore-5.55.ebuild
deleted file mode 100644
index 71f04c0a70f..00000000000
--- a/x11-misc/xlockmore/xlockmore-5.55.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
-SRC_URI="http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( virtual/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	"${FILESDIR}"/${PN}-5.55-soundpath.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/files/, x11-misc/xlockmore/
@ 2019-09-08 16:54 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2019-09-08 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     4c57e80d62604214a0ce4e4faad9bb1ab24eea90
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 16:54:22 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 16:54:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c57e80d

x11-misc/xlockmore: Old

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-misc/xlockmore/Manifest                        |   1 -
 .../xlockmore/files/xlockmore-5.56-soundpath.patch |  11 --
 x11-misc/xlockmore/xlockmore-5.56.ebuild           | 116 ---------------------
 3 files changed, 128 deletions(-)

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 98e9da74dbb..10557350522 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,6 +1,5 @@
 DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.56.tar.xz 1649808 BLAKE2B 82d56a3570bd1be52014503d7c0a36cf27f68aaf31fe4a7ed06159dc796dbd1410711a56fa8e72709499b1ceb3063b2acd9646ba38400669d3671d04e9fb5745 SHA512 1ae5cde5d0167897229e9cb8ebd15e26fdeadc9b0e2d221e6334980f23403385bf1adbd44a955b455e3ecdf8b02b18b0e06273d8dc566b17ac3692ee5ae44f4d
 DIST xlockmore-5.57.tar.xz 1835880 BLAKE2B b26a9792286ded7647c816b907107b9c524ddbf46afab94c5b6b5dc5d5c918f5715c914ce4246497018bd56fd11329bcd1afe07608e44a70d24dd2c4c3d97e38 SHA512 2107efc7e1e9c811b6f86e9bb048dae3861a4e2f421b3d963856a77746834c08c5d349dc15cb3bc9b9aaf21abdc8f0e4af9463a90359b575604f3393c325400f
 DIST xlockmore-5.58.tar.xz 1878452 BLAKE2B 90b19c7c7c99188b056e69d80c0e89a0030faba46f942bd5e278403cde00ba66fe626f457dcf03e049280c0eff1af0dd3e598dda8e2d8d7eee194e38e97124b5 SHA512 470107a9f00c94db8f1ce20c33d04a3b0cbd3d5616aeffa42f98d3a75053cfd8a05a63e38349a88cfc3056fb7bdf3beeaa4277dc83121c35bcff071955ed9511
 DIST xlockmore-5.59ALPHA4.tar.xz 1884644 BLAKE2B eb3c7ba4467d75daf9cd7a12a256cc2c7e5a81aa8635d46b4190a03d1e6c509dabed717976d7bba6de9e58aca35530347da059bb48f6d71bc16d0d6766a05479 SHA512 ea4f47196432013c52078b0c5af4172e7db7ff064b37dacd6890886b815c2b18d439109cf871428b80eb0654132c318e3b0231176ad3c45f58bd72c003ca66f9

diff --git a/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
deleted file mode 100644
index a5c9079e3ae..00000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modes/Makefile.in
-+++ b/modes/Makefile.in
-@@ -624,7 +624,7 @@
- install-sound :
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	@NOPLAY@$(INSTALL_SCRIPT) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
--	$(top_srcdir)/mkinstalldirs $(SOUNDPATH)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
- 	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
- 	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
- 	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)

diff --git a/x11-misc/xlockmore/xlockmore-5.56.ebuild b/x11-misc/xlockmore/xlockmore-5.56.ebuild
deleted file mode 100644
index 7679ed6cc89..00000000000
--- a/x11-misc/xlockmore/xlockmore-5.56.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( virtual/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-	"${FILESDIR}"/${PN}-5.56-soundpath.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_unpack() {
-	unpack ${P/_alpha/ALPHA}.tar.xz
-	xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-flags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/files/, x11-misc/xlockmore/
@ 2022-12-07 21:29 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-12-07 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     71ae0b143a55fd45d4fd56cff13438cdbc602089
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Wed Dec  7 16:18:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 21:29:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ae0b14

x11-misc/xlockmore: version bump to 5.71, patch

- version bump to 5.71
- patch to fix build on clang16
- add filter-lto

Closes: https://bugs.gentoo.org/880909
Closes: https://bugs.gentoo.org/864761

Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28590
Signed-off-by: Sam James <sam <AT> gentoo.org>

 x11-misc/xlockmore/Manifest                        |   1 +
 .../xlockmore-5.71-fix-build-for-clang16.patch     |  28 +++++
 x11-misc/xlockmore/xlockmore-5.71.ebuild           | 125 +++++++++++++++++++++
 3 files changed, 154 insertions(+)

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 319f4fb8911b..1c67c5eba60b 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,2 +1,3 @@
 DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d
 DIST xlockmore-5.69.tar.xz 2008396 BLAKE2B 69341456769f34c1ac537f382b4baf287b5da47f4620581cbea5ab92749a26467781ebb6d7f3dfa9bd1eedf92d21fb8e501715af681972f06007408a5a44f4e5 SHA512 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9
+DIST xlockmore-5.71.tar.xz 2048496 BLAKE2B 417bd4175a483d350cfa098c8a2488f81df9758874c1b53c36a6c2ae23f3b17c942c089d8ecce432f8db244cd8c4df7e79854ff9f2156153ee838ac98f2778ad SHA512 d09cd28dbca37db5e8fa7a388f4d797369b82a856b509414dd6dca5b586506c466b0fb112947a6a0c71e8c8de7cc125ef19c0fa358edc2a521ad38c255946e58

diff --git a/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch b/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch
new file mode 100644
index 000000000000..a6bd223373b1
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch
@@ -0,0 +1,28 @@
+Clang16 will not allow assigning imcompatbile function pointer types.
+Therefore this patch adds casts to the function pointers.
+
+Bug: https://bugs.gentoo.org/880909
+This patch has been sent to upstream via mail. 
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-07)
+
+--- a/xlock/vtlock_proc.c
++++ b/xlock/vtlock_proc.c
+@@ -188,7 +188,7 @@ find_x_proc(int disp_nr, dev_t lxdev, ino_t lxino)
+     lencmd = strlen(xcmd_ref);
+     if ( stat( PROCDIR, &stbuf ) == -1 ) return( (pid_t)-1 );
+     namelist = (struct dirent **) malloc(sizeof (struct dirent *));
+-    if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, alphasort)) == -1 )
++    if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, (int (*)(const void *, const void *))alphasort)) == -1 )
+     {
+       free(namelist);
+       return( (pid_t)-1 );
+@@ -301,7 +301,7 @@ scan_x_fds( struct inode_ref *inotab, int ln_ttys, pid_t proc )
+ 
+     (void) sprintf(xfddir, PROCDIR "/%d/fd", proc);
+     namelist = (struct dirent **) malloc(sizeof (struct dirent *));
+-    if (scan_dir(xfddir, &namelist, NULL, alphasort) == -1) {
++    if (scan_dir(xfddir, &namelist, NULL, (int (*)(const void *, const void *))alphasort) == -1) {
+         free(namelist);
+         return 0;
+     }

diff --git a/x11-misc/xlockmore/xlockmore-5.71.ebuild b/x11-misc/xlockmore/xlockmore-5.71.ebuild
new file mode 100644
index 000000000000..0eebd9e89e6c
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.71.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz
+"
+S="${WORKDIR}/${P/_alpha/ALPHA}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( sys-libs/pam )
+	truetype? ( media-libs/freetype:2 )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	#"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-5.71-fix-build-for-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/XLOCKLIBPATHS="-L/d' \
+		-e '/XMLOCKLIBPATHS="-L/d' \
+		-e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# #864761
+	filter-lto
+
+	local myconf=()
+
+	if use opengl && use truetype; then
+		append-cppflags -DFTGL213
+
+		myconf=( --with-ftgl )
+	else
+		myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(use_with crypt)
+		$(use_with debug editres)
+		$(use_with gtk gtk2)
+		$(use_with imagemagick magick)
+		$(use_with motif)
+		$(use_with nas)
+		$(use_with opengl mesa)
+		$(use_with opengl)
+		$(use_with truetype freetype)
+		$(use_with truetype ttf)
+		$(use_with xinerama)
+		--disable-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	if use pam; then
+		pamd_mimic_system xlock auth
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/files/, x11-misc/xlockmore/
@ 2024-12-14 11:38 Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2024-12-14 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     f2fda4f0ebbc837e506178bac0d15ce61846a6df
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 11:37:50 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 11:38:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2fda4f0

x11-misc/xlockmore: drop unused file xlockmore-5.64_alpha0-LDFLAGS.patch

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../files/xlockmore-5.64_alpha0-LDFLAGS.patch      | 33 ----------------------
 x11-misc/xlockmore/xlockmore-5.71.ebuild           |  3 +-
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
deleted file mode 100644
index f36e3ab0b7a2..000000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/modes/Makefile.in
-+++ b/modes/Makefile.in
-@@ -344,7 +344,7 @@
- CXXFLAGS = @CXXFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
-+XLOCKLDFLAGS = $(LDFLAGS) @XLOCKLDFLAGS@ $(CHECKLDFLAG)
- XLIBS = @XLIBS@
- XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@
- 
---- a/xmlock/Makefile.in
-+++ b/xmlock/Makefile.in
-@@ -94,7 +94,7 @@
- CFLAGS = @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
-+XMLOCKLDFLAGS = $(LDFLAGS) @XMLOCKLDFLAGS@
- XLIBS = @XLIBS@
- XMLOCKLIBS = @XMLOCKLIBS@
- #If you have purify, and want to use it, uncomment this definition or
---- a/xglock/Makefile.in
-+++ b/xglock/Makefile.in
-@@ -92,7 +92,7 @@
- CFLAGS = @GTK_CFLAGS@ @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
-+XGLOCKLDFLAGS = $(LDFLAGS) @XGLOCKLDFLAGS@
- XLIBS = @XLIBS@
- XGLOCKLIBS = @XGLOCKLIBS@
- #If you have purify, and want to use it, uncomment this definition or

diff --git a/x11-misc/xlockmore/xlockmore-5.71.ebuild b/x11-misc/xlockmore/xlockmore-5.71.ebuild
index b774e8bccb86..6eb3c404333e 100644
--- a/x11-misc/xlockmore/xlockmore-5.71.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -53,7 +53,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.46-freetype261.patch
 	"${FILESDIR}"/${PN}-5.47-CXX.patch
 	"${FILESDIR}"/${PN}-5.47-strip.patch
-	#"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-5.71-fix-build-for-clang16.patch
 )
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-12-14 11:38 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-20  9:19 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/files/, x11-misc/xlockmore/ Jeroen Roovers
  -- strict thread matches above, loose matches on Subject: below --
2024-12-14 11:38 Florian Schmaus
2022-12-07 21:29 Sam James
2019-09-08 16:54 Jeroen Roovers
2016-05-14 10:47 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox