OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xlockmore?expand=0&rev=2

xlockmore-5.23.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3788eb9fa8d95e8be681508e980fa92d3001abed93b2e47e83cc3005c92d0c48
-size 1773160

xlockmore-5.24.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbee7bbe35c08afcbe419603fae60aee7898bbd85a3175dc788f02ddbb9f5a39
+size 1783395

xlockmore-gltt+ftgl.patch

@@ -0,0 +1,28 @@
+--- modes/Makefile.in
++++ modes/Makefile.in
+@@ -99,8 +99,9 @@
+ @CCC@@GL@$(DOG)i_twojet$(OG)i_twojetvec$(O)
+ @CCC@@GL@XLOCKDEPCPPGLOBJS = $(INVERTOBJS)
+ @CCC@@GL@XLOCKMULTCPPGLOBJS = $(DOG)invert$(O)
+-@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O)
+-@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS = $(DOG)text3d2$(OG)rotator$(O)
++XLOCKTEXTGLOBJS =
++@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS += $(DOG)text3d$(O)
++@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS += $(DOG)text3d2$(OG)rotator$(O)
+ @GL@SPROINGIESOBJS = $(DOG)buildlwo$(OG)sproingiewrap$(OG)s1_b$(O)$(S)\
+ @GL@$(DOG)s1_1$(OG)s1_2$(OG)s1_3$(OG)s1_4$(OG)s1_5$(OG)s1_6$(O)
+ @GL@ATLANTISOBJS = $(DOG)dolphin$(OG)shark$(OG)swim$(OG)whale$(O)
+--- modes/glx/Makefile.in
++++ modes/glx/Makefile.in
+@@ -53,8 +53,9 @@
+ @CCC@@GL@$(DOG)i_twojet$(OG)i_twojetvec$(O)
+ @CCC@@GL@XLOCKDEPCPPGLOBJS = $(INVERTOBJS)
+ @CCC@@GL@XLOCKMULTCPPGLOBJS = $(DOG)invert$(O)
+-@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS = $(DOG)text3d$(O)
+-@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS = $(DOG)text3d2$(OG)rotator$(O)
++XLOCKTEXTGLOBJS =
++@CCC@@GL@@GLTT@XLOCKTEXTGLOBJS += $(DOG)text3d$(O)
++@CCC@@GL@@FTGL@XLOCKTEXTGLOBJS += $(DOG)text3d2$(OG)rotator$(O)
+ @GL@SPROINGIESOBJS = $(DOG)buildlwo$(OG)sproingiewrap$(OG)s1_b$(O)$(S)\
+ @GL@$(DOG)s1_1$(OG)s1_2$(OG)s1_3$(OG)s1_4$(OG)s1_5$(OG)s1_6$(O)
+ @GL@ATLANTISOBJS = $(DOG)dolphin$(OG)shark$(OG)swim$(OG)whale$(O)

xlockmore-gltt-libttf.patch

@@ -0,0 +1,20 @@
+--- configure.in
++++ configure.in
+@@ -1279,7 +1279,7 @@
+ # See if we find them without any special options.
+ # Do not add to $LIBS permanently.
+ ac_save_LIBS="$LIBS"
+-LIBS="-l$gltt_direct_test_library $LIBS"
++LIBS="-l$gltt_direct_test_library -lttf $LIBS"
+ # First see if replacing the include by lib works.
+ for ac_dir in `echo "$ac_gltt_includes" | sed s%/X11$%% | sed s/include/lib/` \
+                           \
+@@ -1451,7 +1451,7 @@
+                               \
+     /usr/local/include        \
+     /usr/remote/include       \
+-    /usr/include/X11          \
++    /usr/include              \
+     /usr/unsupported/include  \
+     /usr/athena/include       \
+     /usr/local/x11r5/include  \

xlockmore-strict-aliasing.patch

@@ -0,0 +1,22 @@
+--- xlock/iostuff.c
++++ xlock/iostuff.c
+@@ -567,7 +567,7 @@
+ 			if (!blogo.data) {
+ 				if (BitmapSuccess == XbmReadFileToImage(bitmap_local,
+ 						 &blogo.width, &blogo.height,
+-					   (unsigned char **) &blogo.data)) {
++					   &blogo.data)) {
+ 					blogo.bytes_per_line = (blogo.width + 7) / 8;
+ 					*graphics_format = IS_XBMFILE;
+ 					*logo = &blogo;
+--- xlock/vroot.h
++++ xlock/vroot.h
+@@ -108,7 +108,7 @@
+ 					 __SWM_VROOT, 0, 1, False, XA_WINDOW,
+ 						&actual_type, &actual_format,
+ 							&nitems, &bytesafter,
+-							(unsigned char **) &newRoot) == Success && newRoot) {
++							&newRoot) == Success && newRoot) {
+ 						root = *newRoot;
+ 						break;
+ 					}

xlockmore.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Aug  7 13:34:16 CEST 2007 - sbrabec@suse.cz
+
+- Updated to version 5.24:
+  * penrose added to xlock95.
+  * xcl added with a fix for DefaultScreen, which should not be
+    there since xlock is a multiscreen program.
+  * Patch for solitare and reducing binary size for xlock95.
+  * dilemma, voters, wator hexagonal/triangular drawing
+    improvements.
+  * More triangular/hexagonal life.
+  * Fixes for old options for command line -rule S2b34B2a and
+      -rule S2a2b4aB2a3a4b using -neighbors 6.
+  * Fixes for hexagonal diagonal shooters.
+  * Added new hexagonal life -rule S35B2 and S3B245.
+  * Added many new triangular life rules with gliders.
+  * Updated random soup to include multiple symmetries.
+  * Added options runtime -glidersearch and -patternsearch.
+  * Added -repeat num option to help find patterns that do not
+    repeat in num periods.
+  * Added -vertical option to more modules.
+  * DirectColor fixes for password window.
+- Build with GLTT and FTGL modules.
+
 -------------------------------------------------------------------
 Wed Nov 15 14:41:31 CET 2006 - dmueller@suse.de
 

xlockmore.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package xlockmore (Version 5.23)
+# spec file for package xlockmore (Version 5.24)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,19 +11,14 @@
 # norootforbuild
 
 Name:           xlockmore
-BuildRequires:  bc esound-devel freeglut-devel freetype2-devel gcc-c++ libdrm-devel pkgconfig
+BuildRequires:  bc esound-devel fdupes freeglut-devel freetype2-devel ftgl-devel gcc-c++ gltt-devel libdrm-devel pkg-config
-%if %suse_version > 1010
+License:        GPL v2 or later, X11/MIT
-BuildRequires:  ftgl-devel
-%else
-BuildRequires:  ftgl
-%endif
-License:        Other License(s), see package
 Group:          System/X11/Utilities
 Provides:       xlock
 Obsoletes:      xlock
 Autoreqprov:    on
-Version:        5.23
+Version:        5.24
-Release:        8
+Release:        1
 Summary:        Screen Saver and Locker for the X Window System
 URL:            http://www.tux.org/~bagleyd/xlockmore.html
 Source:         %{name}-%{version}.tar.bz2
@@ -37,6 +32,9 @@ Patch2:         %{name}-bitmaps_xorg6.patch
 Patch3:         xlockmore-ttf_dir.patch
 Patch4:         xlockmore-ttf_dir_xorg6.patch
 # end of X.org related patches
+Patch5:         xlockmore-gltt-libttf.patch
+Patch6:         xlockmore-gltt+ftgl.patch
+Patch7:         xlockmore-strict-aliasing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -85,28 +83,25 @@ Authors:
 %patch2
 %patch4
 %endif
+%patch5
+%patch6
+%patch7
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
 aclocal
 autoconf
-export CPPFLAGS=-I/usr/include/FTGL
+export CPPFLAGS="-I/usr/include/FTGL"
-%ifarch %arm
+export CFLAGS="$RPM_OPT_FLAGS"
-# ICE workaround
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O1"
-%endif
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 ./configure \
 	--prefix=%{_xorg7_prefix}\
 	--with-libraries=%{_libdir}\
 	--without-motif\
-	-without-gtk \
+	--without-gtk\
-	-without-gtk2 \
 	--with-passwd-helper=/sbin/unix2_chkpwd\
 	--disable-bomb\
         --enable-vtlock\
-	--disable-gtk \
         --enable-use-mb\
         --x-includes=%{_xorg7_prefix}/include\
         --x-libraries=%{_xorg7_prefix}/%_lib
@@ -132,6 +127,8 @@ install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock
 install -m 755 %{S:3} $RPM_BUILD_ROOT/usr/%{_xorg7bin}/xlock
 %endif
 
+%fdupes $RPM_BUILD_ROOT/usr
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_xorg7_mandir}/man1/xlock.1x.gz
 %doc README docs/cell_automata docs/Purify docs/Revisions docs/TODO
 %config /etc/pam.d/xlock
-%config /usr/%{_xorg7libshare}/X11/app-defaults/XLock
+/usr/%{_xorg7libshare}/X11/app-defaults/XLock
 /usr/%{_xorg7bin}/xlock
 /usr/%{_xorg7libs32}/xlock
 /usr/%{_xorg7pixmaps}/X11/bitmaps/*
@@ -150,7 +147,28 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/X11R6/include/X11/pixmaps
 %endif
 
-%changelog -n xlockmore
+%changelog
+* Tue Aug 07 2007 - sbrabec@suse.cz
+- Updated to version 5.24:
+  * penrose added to xlock95.
+  * xcl added with a fix for DefaultScreen, which should not be
+  there since xlock is a multiscreen program.
+  * Patch for solitare and reducing binary size for xlock95.
+  * dilemma, voters, wator hexagonal/triangular drawing
+  improvements.
+  * More triangular/hexagonal life.
+  * Fixes for old options for command line -rule S2b34B2a and
+      -rule S2a2b4aB2a3a4b using -neighbors 6.
+  * Fixes for hexagonal diagonal shooters.
+  * Added new hexagonal life -rule S35B2 and S3B245.
+  * Added many new triangular life rules with gliders.
+  * Updated random soup to include multiple symmetries.
+  * Added options runtime -glidersearch and -patternsearch.
+  * Added -repeat num option to help find patterns that do not
+  repeat in num periods.
+  * Added -vertical option to more modules.
+  * DirectColor fixes for password window.
+- Build with GLTT and FTGL modules.
 * Wed Nov 15 2006 - dmueller@suse.de
 - build against freetype2, not freetype
 * Mon Oct 23 2006 - sbrabec@suse.cz