packages: uae/uae-ac_fixes.patch, uae/uae-preserve_home_in_writing_optionsf...

sparky sparky at pld-linux.org
Sun Nov 8 19:01:42 CET 2009 

Author: sparky                       Date: Sun Nov  8 18:01:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.8.29

---- Files affected:
packages/uae:
   uae-ac_fixes.patch (1.3 -> 1.4) , uae-preserve_home_in_writing_optionsfile.patch (1.1 -> 1.2) , uae-uae_reset_args.patch (1.1 -> 1.2) , uae.spec (1.28 -> 1.29) , uae-close_window_hack.patch (1.1 -> NONE)  (REMOVED), uae-fix_save_config.patch (1.1 -> NONE)  (REMOVED), uae-fix_static_declatarions.patch (1.1 -> NONE)  (REMOVED), uae-gtk-ui-cleanup.patch (1.1 -> NONE)  (REMOVED), uae-makefile_more_cleaning.patch (1.1 -> NONE)  (REMOVED), uae-memory_leaks_in_gui.patch (1.1 -> NONE)  (REMOVED), uae-snd_file_fix.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/uae/uae-ac_fixes.patch
diff -u packages/uae/uae-ac_fixes.patch:1.3 packages/uae/uae-ac_fixes.patch:1.4
--- packages/uae/uae-ac_fixes.patch:1.3	Thu Jan 12 19:57:49 2006
+++ packages/uae/uae-ac_fixes.patch	Sun Nov  8 19:01:36 2009
@@ -1,7 +1,7 @@
 diff -ur uae-0.8.25.orig/configure.in uae-0.8.25/configure.in
 --- uae-0.8.25.orig/configure.in	2005-07-01 15:00:17.000000000 +0200
 +++ uae-0.8.25/configure.in	2006-01-12 14:30:50.004955500 +0100
-@@ -56,12 +56,6 @@
+@@ -57,12 +57,6 @@
  
  NEED_THREAD_SUPPORT=no
  
@@ -14,31 +14,21 @@
  LDFLAGS="$LDFLAGS -L."
  
  dnl Checks for libraries.
-@@ -615,26 +609,7 @@
- ], [AC_MSG_RESULT(yes); HAVEGLIBC2=yes], AC_MSG_RESULT(no))
- fi
- 
--if test $ac_cv_c_compiler_gnu = yes; then
--  WARNING_CFLAGS="-Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes"
--  OPTIMIZE_CFLAGS="-O2 -fomit-frame-pointer"
+@@ -670,8 +664,6 @@
+ if test $ac_cv_c_compiler_gnu = yes; then
+   WARNING_CFLAGS="-Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes"
+   OPTIMIZE_CFLAGS="-O2 -fomit-frame-pointer"
 -  dnl Not nice, but needed to turn off -g
 -  CFLAGS=
--fi
--
--if [[ "x$DO_PROFILING" = "xyes" ]]; then
--  if [[ "x$CC" = "xgcc" ]]; then
--    OPTIMIZE_CFLAGS="-O"
--    DEBUG_CFLAGS="-g -fno-inline -fno-omit-frame-pointer -pg -DUSE_PROFILING"
--    LDFLAGS="-pg"
--  else
--    DO_PROFILING=no
--    echo "Don't know how to set up profiling for your compiler."
--    NR_ERRORS=`expr $NR_ERRORS + 1`
--  fi
--fi
--
+ fi
+ 
+ if [[ "x$DO_PROFILING" = "xyes" ]]; then
+@@ -686,7 +678,7 @@
+   fi
+ fi
+ 
 -CFLAGS="$OPTIMIZE_CFLAGS $DEBUG_CFLAGS $WARNING_CFLAGS $CFLAGS $ADDITIONAL_CFLAGS"
-+CFLAGS="$CFLAGS $CFLAGS $ADDITIONAL_CFLAGS"
++CFLAGS="$DEBUG_CFLAGS $WARNING_CFLAGS $CFLAGS $ADDITIONAL_CFLAGS"
  
- if [[ "x$HAVEGCC27" = "xyes" ]]; then
-   CFLAGS="$CFLAGS -DGCCCONSTFUNC=\"__attribute__((const))\""
+ if test $ac_cv_prog_gcc = yes; then
+   if test $HAVEGCC27 != yes; then

================================================================
Index: packages/uae/uae-preserve_home_in_writing_optionsfile.patch
diff -u packages/uae/uae-preserve_home_in_writing_optionsfile.patch:1.1 packages/uae/uae-preserve_home_in_writing_optionsfile.patch:1.2
--- packages/uae/uae-preserve_home_in_writing_optionsfile.patch:1.1	Sun May 20 17:58:26 2007
+++ packages/uae/uae-preserve_home_in_writing_optionsfile.patch	Sun Nov  8 19:01:36 2009
@@ -1,28 +1,15 @@
-Keep saving optionsfile to home dir, even if there is not one when reading
-config for the first time.
-
-Antonio Ospite <ospite at studenti.unina.it>
-
-diff -bpruN uae-0.8.25/src/main.c uae-0.8.25_patched/src/main.c
 --- uae-0.8.25/src/main.c	2006-06-07 17:41:49.000000000 +0200
 +++ uae-0.8.25_patched/src/main.c	2006-06-08 20:33:05.000000000 +0200
-@@ -357,6 +357,7 @@ void parse_cmdline (int argc, char **arg
- static void parse_cmdline_and_init_file (int argc, char **argv)
- {
-     char *home;
-+    char *pwd_optionsfile;
- 
-     strcpy (optionsfile, "");
- 
-@@ -374,8 +375,9 @@ static void parse_cmdline_and_init_file 
-     if (! cfgfile_load (&currprefs, optionsfile)) {
- #ifdef OPTIONS_IN_HOME
- 	/* sam: if not found in $HOME then look in current directory */
+--- uae-0.8.29/src/main.c~	2009-11-08 18:22:11.264214266 +0100
++++ uae-0.8.29/src/main.c	2009-11-08 18:22:38.697407599 +0100
+@@ -506,8 +506,8 @@
+ 	 * don't use the optionsfile variable, so that we will save changes
+ 	 * to the home directory.  */
+ 	char pwd_optionsfile[256];
 -	strcpy (optionsfile, OPTIONSFILENAME);
 -	cfgfile_load (&currprefs, optionsfile);
-+  /* ao: but let's use a temporary name, so we save to home dir, yet :) */
 +	strcpy (pwd_optionsfile, OPTIONSFILENAME);
 +	cfgfile_load (&currprefs, pwd_optionsfile);
  #endif
      }
- 
+     printf("optsfile: %s\n", optionsfile );

================================================================
Index: packages/uae/uae-uae_reset_args.patch
diff -u packages/uae/uae-uae_reset_args.patch:1.1 packages/uae/uae-uae_reset_args.patch:1.2
--- packages/uae/uae-uae_reset_args.patch:1.1	Sun May 20 17:58:26 2007
+++ packages/uae/uae-uae_reset_args.patch	Sun Nov  8 19:01:36 2009
@@ -64,18 +64,6 @@
  	    break;
  	case IDC_QUITEMU:
  	    uae_quit();
-diff -pruN uae-0.8.25___orig/src/sdlgfx.c uae-0.8.25/src/sdlgfx.c
---- uae-0.8.25___orig/src/sdlgfx.c	2006-06-07 17:41:49.000000000 +0200
-+++ uae-0.8.25/src/sdlgfx.c	2006-06-07 17:42:57.000000000 +0200
-@@ -875,7 +875,7 @@ void handle_events (void)
- 
-     /* Handle UAE reset */
-     if ((keystate[AK_CTRL] || keystate[AK_RCTRL]) && keystate[AK_LAMI] && keystate[AK_RAMI])
--	uae_reset ();
-+	uae_reset (0);
- }
- 
- int check_prefs_changed_gfx (void)
 diff -pruN uae-0.8.25___orig/src/svga.c uae-0.8.25/src/svga.c
 --- uae-0.8.25___orig/src/svga.c	2006-06-07 17:41:49.000000000 +0200
 +++ uae-0.8.25/src/svga.c	2006-06-07 17:43:17.000000000 +0200

================================================================
Index: packages/uae/uae.spec
diff -u packages/uae/uae.spec:1.28 packages/uae/uae.spec:1.29
--- packages/uae/uae.spec:1.28	Sun May 20 18:01:00 2007
+++ packages/uae/uae.spec	Sun Nov  8 19:01:36 2009
@@ -2,31 +2,23 @@
 Summary:	Unix Amiga Emulator
 Summary(pl.UTF-8):	Uniksowy Emulator Amigi
 Name:		uae
-Version:	0.8.25
-Release:	2
+Version:	0.8.29
+Release:	1
 License:	GPL
 Group:		Applications/Emulators
-Source0:	ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/%{name}-%{version}.tar.gz
-# Source0-md5:	e660ca2bec3c016c978ef88117b0c432
+Source0:	http://www.amigaemulator.org/files/sources/develop/%{name}-%{version}.tar.bz2
+# Source0-md5:	54abbabb5e8580b679c52de019141d61
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-ac_fixes.patch
-Patch1:		%{name}-snd_file_fix.patch
-Patch2:		%{name}-allow_spaces_in_zip_filenames.patch
-Patch3:		%{name}-close_window_hack.patch
-Patch4:		%{name}-fix_save_config.patch
-Patch5:		%{name}-fix_static_declatarions.patch
-Patch6:		%{name}-gtk-ui-cleanup.patch
-Patch7:		%{name}-makefile_more_cleaning.patch
-Patch8:		%{name}-memory_leaks_in_gui.patch
-Patch9:		%{name}-preserve_home_in_writing_optionsfile.patch
-Patch10:	%{name}-struct_uae_wrong_fields_name.patch
-Patch11:	%{name}-uae_reset_args.patch
-URL:		http://www.freiburg.linux.de/~uae/
+Patch1:		%{name}-allow_spaces_in_zip_filenames.patch
+Patch2:		%{name}-preserve_home_in_writing_optionsfile.patch
+Patch3:		%{name}-struct_uae_wrong_fields_name.patch
+Patch4:		%{name}-uae_reset_args.patch
+URL:		http://www.amigaemulator.org/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gnome-libs-devel
 BuildRequires:	gtk+-devel
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,19 +47,11 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome
+%{__aclocal}
 %{__autoconf}
-%{__automake} || :
 %configure \
 	--enable-dga		\
 	--enable-vidmode	\
@@ -109,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2009/11/08 18:01:36  sparky
+- updated to 0.8.29
+
 Revision 1.28  2007/05/20 16:01:00  arekm
 - rel 2; bunch of patches from gentoo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uae/uae-ac_fixes.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uae/uae-preserve_home_in_writing_optionsfile.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uae/uae-uae_reset_args.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/uae/uae.spec?r1=1.28&r2=1.29&f=u

More information about the pld-cvs-commit mailing list