summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-01-16 00:18:59 +0100
committerLars Wendler <polynomial-c@gentoo.org>2017-01-16 00:23:53 +0100
commit99d8a90d637b85eda709f252f48845c079cda084 (patch)
tree6081d1ff21b3cd9157f3aebdeed1dc5b8a626bab /x11-misc/xlockmore/files
parentnet-misc/icecast: Removed old. (diff)
downloadgentoo-99d8a90d637b85eda709f252f48845c079cda084.tar.gz
gentoo-99d8a90d637b85eda709f252f48845c079cda084.tar.bz2
gentoo-99d8a90d637b85eda709f252f48845c079cda084.zip
x11-misc/xlockmore: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'x11-misc/xlockmore/files')
-rw-r--r--x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch22
-rw-r--r--x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch185
-rw-r--r--x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch18
3 files changed, 0 insertions, 225 deletions
diff --git a/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch b/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
deleted file mode 100644
index a0b8f6d3e5b2..000000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xlockmore-5.31/configure.in
-===================================================================
---- xlockmore-5.31.orig/configure.in
-+++ xlockmore-5.31/configure.in
-@@ -8,17 +8,7 @@ AC_CANONICAL_HOST
- canonical=$host
-
- 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
- AC_PROG_CXX
--if test "${CXX}" = "xlC" ; then
-- CXXFLAGS="${CXXFLAGS} -+"
--fi
-
- dnl If you're using g++-2.95 or later and have old X11 includes, you may need
- dnl to use "g++ -fpermissive" in the Makefiles
diff --git a/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch b/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
deleted file mode 100644
index 85ca2fe259d6..000000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-Index: xlockmore-5.31/modes/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/modes/Makefile.in
-+++ xlockmore-5.31/modes/Makefile.in
-@@ -329,6 +329,7 @@ DEFS = @DEFS@ $(DEFINES)
- XLOCKINC = -I. -I.. -I$(top_srcdir) -I$(UTILDIR) -I../.. @XLOCKINC@
- CFLAGS = @CFLAGS@
- CXXFLAGS = @CXXFLAGS@
-+LDFLAGS = @LDFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
- XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
-@@ -367,7 +368,7 @@ PURIFY = @PURIFY@
-
- @MODULES@$(NORMMODULES) : %.xlk:%.o
- @MODULES@ $(RM) $@
--@MODULES@ $(CXX) $(CXXFLAGS) -shared -o $@ $<
-+@MODULES@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $<
-
- $(DOG)fire.xlk : $(DOG)xpm-ximage.o
- $(DOG)lament.xlk : $(DOG)xpm-ximage.o
-@@ -375,60 +376,60 @@ $(DOG)sballs.xlk : $(DOG)xpm-ximage.o
-
- @MODULES@@GL@$(DOG)fire.xlk $(DOG)lament.xlk $(DOG)sballs.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
-
- $(DOG)pipes.xlk : $(DOG)buildlwo.o $(DOG)pipeobjs.o
-
- @MODULES@@GL@$(DOG)pipes.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
-
- $(DOG)sproingies.xlk : $(SPROINGIESOBJS)
-
- @MODULES@@GL@$(DOG)sproingies.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
-
- $(DOG)atlantis.xlk : $(ATLANTISOBJS)
-
- @MODULES@@GL@$(DOG)atlantis.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
-
- $(DOG)bubble3d.xlk : $(BUBBLE3DOBJS)
-
- @MODULES@@GL@$(DOG)bubble3d.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
-
- $(DOG)glplanet.xlk : $(GLPLANETOBJS)
-
- @MODULES@@GL@$(DOG)glplanet.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
-
- $(DOG)molecul.xlk : $(MOLECULEOBJS)
-
- @MODULES@@GL@$(DOG)molecule.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
-
- $(DOG)juggler3d.xlk : $(JUGGLER3DOBJS)
-
- @MODULES@@GL@$(DOG)juggler3d.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
-
- $(DOG)invert.xlk : $(INVERTOBJS)
-
- @MODULES@@CCC@@GL@$(DOG)invert.xlk : %.xlk:%.o
- @MODULES@@CCC@@GL@ $(RM) $@
--@MODULES@@CCC@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(INVERTOBJS) $<
-+@MODULES@@CCC@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(INVERTOBJS) $<
-
- xlock : $(UTILOBJDIR)xlock
-
- $(UTILOBJDIR)xlock : $(XLOCKOBJS)
-- $(PURIFY) $(CXX) $(CXXFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
-+ $(PURIFY) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
- @ $(ECHO) "$@ BUILD COMPLETE"
- @ $(ECHO) ""
-
-@@ -587,10 +588,10 @@ $(GLOBJDIR)tunnel_draw.o : $(GLDIR)tunne
- .SUFFIXES : $(C) $(CX) $(O) $(M)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-
- $(CX)$(O) :
-- $(CXX) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
-+ $(CXX) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
-
- install : install-program install-man install-ad
- @ $(ECHO) "$@ COMPLETE"
-Index: xlockmore-5.31/xglock/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/xglock/Makefile.in
-+++ xlockmore-5.31/xglock/Makefile.in
-@@ -90,6 +90,7 @@ ECHO = echo
- DEFS = @DEFS@ $(DEFINES) -DXGLOCKRC_FILE=\"$(datadir)/xlock/xglockrc\"
- XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_srcdir)
- CFLAGS = @GTK_CFLAGS@ @CFLAGS@
-+LDFLAGS= @LDFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
- XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
-@@ -101,14 +102,14 @@ XGLOCKLIBS = @XGLOCKLIBS@
- PURIFY = @PURIFY@
-
- xglock : $(XGLOCKOBJS)
-- $(PURIFY) $(CC) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
-+ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
- @ $(ECHO) "$@ BUILD COMPLETE"
- @ $(ECHO) ""
-
- .SUFFIXES : $(C) $(O)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
-
- install : @INSTALL_XGLOCK@
-
-Index: xlockmore-5.31/xlock/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/xlock/Makefile.in
-+++ xlockmore-5.31/xlock/Makefile.in
-@@ -118,6 +118,7 @@ XLOCKINC = -I. -I.. -I$(top_srcdir) @XLO
- CFLAGS = @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
-+LDFLAGS = @LDFLAGS@
-
- #If you have purify, and want to use it, uncomment this definition or
- # run the make as `make PURIFY=purify'
-@@ -127,7 +128,7 @@ PURIFY = @PURIFY@
- .SUFFIXES : $(C) $(O)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-
- install :
-
-Index: xlockmore-5.31/xmlock/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/xmlock/Makefile.in
-+++ xlockmore-5.31/xmlock/Makefile.in
-@@ -92,6 +92,8 @@ ECHO = echo
- DEFS = @DEFS@ $(DEFINES)
- XMLOCKINC = @XMLOCKINC@ -I.. -I$(top_srcdir)
- CFLAGS = @CFLAGS@
-+LDFLAGS= @LDFLAGS@
-+
- #CFLAGS = -O
- #CFLAGS = -g
- XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
-@@ -103,14 +105,14 @@ XMLOCKLIBS = @XMLOCKLIBS@
- PURIFY = @PURIFY@
-
- xmlock : $(XMLOCKOBJS)
-- $(PURIFY) $(CC) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
-+ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
- @ $(ECHO) "$@ BUILD COMPLETE"
- @ $(ECHO) ""
-
- .SUFFIXES : $(C) $(O)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
-
- install : @INSTALL_XMLOCK@
-
diff --git a/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
deleted file mode 100644
index da34870a8b40..000000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Kludge to find >=freetyp2.5.1
-
---- a/configure.in
-+++ b/configure.in
-@@ -1983,6 +1983,13 @@
- fi
- done
-
-+if test -z "$ac_freetype_includes" ; then
-+ tt_inc=/usr/include/freetype2
-+ if test -r "$tt_inc/freetype.h" ; then
-+ no_freetype= ac_freetype_includes=$tt_inc
-+ fi
-+fi
-+
- # Check for the libraries.
- # See if we find them without any special options.
- # Do not add to $LIBS permanently.