From f980a916aca288b8971abb615cd2244af5093825 Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Sep 25 2011 08:58:01 +0000 Subject: updated to upstream 1.5.0 added patches to include hatari window at hatariui startup (SF #18340) dropped Debian man pages now that hatari has its own --- diff --git a/.gitignore b/.gitignore index 0b09cc2..025035e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ hatari-1.3.1.tar.bz2 /hatari-1.4.0.tar.bz2 +/hatari-1.5.0.tar.bz2 diff --git a/hatari-1.4.0-debian-manpages.tar.gz b/hatari-1.4.0-debian-manpages.tar.gz deleted file mode 100644 index bef89d6..0000000 Binary files a/hatari-1.4.0-debian-manpages.tar.gz and /dev/null differ diff --git a/hatari-1.5.0-embedded.patch b/hatari-1.5.0-embedded.patch new file mode 100644 index 0000000..41e0d0a --- /dev/null +++ b/hatari-1.5.0-embedded.patch @@ -0,0 +1,20 @@ + +# HG changeset patch +# User Eero Tamminen +# Date 1315164241 -10800 +# Node ID a99c28bacadd264e195585f961ad98959e922840 +# Parent 7f173c0891c1d501642cb93f802a2117b377e19b +fix bug 18340: check window embedding before creating window + +diff -r 7f173c0891c1 -r a99c28bacadd src/main.c +--- a/src/main.c Sun Sep 04 00:00:08 2011 +0300 ++++ b/src/main.c Sun Sep 04 22:24:01 2011 +0300 +@@ -585,6 +585,7 @@ + Printer_Init(); + RS232_Init(); + Midi_Init(); ++ Control_CheckUpdates(); /* enable window embedding? */ + Screen_Init(); + Main_SetTitle(NULL); + HostScreen_Init(); + diff --git a/hatari-1.5.0-hatariui.patch b/hatari-1.5.0-hatariui.patch new file mode 100644 index 0000000..bbc4d0e --- /dev/null +++ b/hatari-1.5.0-hatariui.patch @@ -0,0 +1,53 @@ + +# HG changeset patch +# User Eero Tamminen +# Date 1315164472 -10800 +# Node ID 679aca45fb459016ba426de78ea7906bab684bc7 +# Parent a99c28bacadd264e195585f961ad98959e922840 +hatariui: hatari max window size defaults now to desktop size + +(affects initial window size i.e. avoids resize at beginning) + +diff -r a99c28bacadd -r 679aca45fb45 python-ui/hatari.py +--- a/python-ui/hatari.py Sun Sep 04 22:24:01 2011 +0300 ++++ b/python-ui/hatari.py Sun Sep 04 22:27:52 2011 +0300 +@@ -266,6 +266,8 @@ + + self._hatari = hatari + self._lock_updates = False ++ self._desktop_w = 0 ++ self._desktop_h = 0 + self._options = [] + + def validate(self): +@@ -687,9 +689,17 @@ + self._change_option("--aspect %s" % str(value)) + + # ------------ max window size --------------- ++ def set_desktop_size(self, w, h): ++ self._desktop_w = w ++ self._desktop_h = h ++ + def get_max_size(self): + w = self.get("[Screen]", "nMaxWidth") + h = self.get("[Screen]", "nMaxHeight") ++ # default to desktop size? ++ if not (w or h): ++ w = self._desktop_w ++ h = self._desktop_h + return (w, h) + + def set_max_size(self, w, h): +diff -r a99c28bacadd -r 679aca45fb45 python-ui/hatariui.py +--- a/python-ui/hatariui.py Sun Sep 04 22:24:01 2011 +0300 ++++ b/python-ui/hatariui.py Sun Sep 04 22:27:52 2011 +0300 +@@ -149,6 +149,8 @@ + socket.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("black")) + socket.set_events(gtk.gdk.ALL_EVENTS_MASK) + socket.set_flags(gtk.CAN_FOCUS) ++ # set max Hatari window size = desktop size ++ self.config.set_desktop_size(gtk.gdk.screen_width(), gtk.gdk.screen_height()) + # set initial embedded hatari size + width, height = self.config.get_window_size() + socket.set_size_request(width, height) + diff --git a/hatari.spec b/hatari.spec index ea415c3..0930930 100644 --- a/hatari.spec +++ b/hatari.spec @@ -1,14 +1,17 @@ Summary: An Atari ST emulator suitable for playing games Name: hatari -Version: 1.4.0 -Release: 5%{?dist} +Version: 1.5.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Emulators URL: http://hatari.berlios.de/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2 -Source1: hatari-1.4.0-debian-manpages.tar.gz -Source2: hatari.desktop +Source1: hatari.desktop +# Fix hatariui to include hatari window at startup +# http://developer.berlios.de/bugs/?func=detailbug&bug_id=18340&group_id=10436 +Patch0: hatari-1.5.0-embedded.patch +Patch1: hatari-1.5.0-hatariui.patch BuildRequires: cmake BuildRequires: SDL-devel >= 1.2.0 BuildRequires: zlib-devel @@ -58,7 +61,8 @@ built-in debugger which can (optionally) embed the Hatari emulator window. %prep %setup -q -%setup -D -T -q -a 1 +%patch0 -p1 +%patch1 -p1 # Fix hataiui to get doc files sed -i 's/"hatari" + sep/"%{name}-%{version}" + sep/' python-ui/uihelpers.py @@ -66,11 +70,12 @@ sed -i 's/"hatari" + sep/"%{name}-%{version}" + sep/' python-ui/uihelpers.py %build %cmake \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_BUILD_TYPE:STRING=None \ -DDOCDIR:PATH=%{_docdir}/%{name}-%{version} \ -DBUILD_SHARED_LIBS:BOOL=OFF . # It does not compile with smp_mflags -make VERBOSE=1 +make %install @@ -81,15 +86,11 @@ make install DESTDIR=%{buildroot} install -d -m 755 %{buildroot}%{_mandir}/fr/man1 install -p -m 644 doc/fr/hatari.1 %{buildroot}%{_mandir}/fr/man1 -# Install man pages from Debian -install -d -m 755 %{buildroot}%{_mandir}/man1 -install -p -m 644 debian-manpages/* %{buildroot}%{_mandir}/man1 - # Install desktop file install -d -m 755 %{buildroot}%{_datadir}/applications desktop-file-install --vendor fedora \ --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE2} + %{SOURCE1} # Extract Mac OS X icons icns2png -x src/gui-osx/Hatari.icns @@ -110,14 +111,6 @@ desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/hatariui.desktop -# Remove script extensions from scripts installed in /usr/bin -mv %{buildroot}%{_bindir}/atari-hd-image.sh \ - %{buildroot}%{_bindir}/atari-hd-image -mv %{buildroot}%{_bindir}/zip2st.sh \ - %{buildroot}%{_bindir}/zip2st -mv %{buildroot}%{_bindir}/hatari-console.py \ - %{buildroot}%{_bindir}/hatari-console - # Install license among docs install -p -m 644 gpl.txt %{buildroot}%{_docdir}/%{name}-%{version} @@ -172,23 +165,30 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/*/apps/%{name}.png %doc %{_docdir}/%{name}-%{version} %exclude %{_datadir}/%{name}/hatariui +%exclude %{_datadir}/%{name}/hconsole %files ui %defattr(-,root,root) %{_bindir}/hatariui -%{_bindir}/hatari-console %{_datadir}/%{name}/hatariui +%{_datadir}/%{name}/hconsole %{_mandir}/man1/hatariui.1* -%{_mandir}/man1/hatari-console.1* +%{_mandir}/man1/hconsole.1* %{_datadir}/applications/hatariui.desktop %{_datadir}/icons/hicolor/32x32/apps/hatari-icon.png %doc python-ui/{README,release-notes.txt,TODO} %exclude %{_datadir}/%{name}/hatariui/README %exclude %{_datadir}/%{name}/hatariui/release-notes.txt %exclude %{_datadir}/%{name}/hatariui/TODO +%exclude %{_datadir}/%{name}/hconsole/release-notes.txt %changelog +* Sun Sep 25 2011 Andrea Musuruane 1.5.0-1 +- updated to upstream 1.5.0 +- added patches to include hatari window at hatariui startup (SF #18340) +- dropped Debian man pages now that hatari has its own + * Wed Feb 09 2011 Fedora Release Engineering - 1.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 005379f..59926b6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -112b544ec4affb7c04e931088e62a115 hatari-1.3.1.tar.bz2 -2f30e5c9e146ee92e3f2f5ae1cef3673 hatari-1.4.0.tar.bz2 +16277cff73ec3a342b87b7b7ea3932f4 hatari-1.5.0.tar.bz2