Attachment 579005 Details for Bug 814512 – Add mingw64-pdcurses

[patch] Add mingw64-pdcurses

mingw-pdcurses-ming64.diff (text/plain), 5.37 KB, created by Ralf Corsepius on 2012-04-20 13:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Corsepius

Created: 2012-04-20 13:50:16 UTC

Size: 5.37 KB

patch

obsolete

>diff --git a/mingw-pdcurses.spec b/mingw-pdcurses.spec
>index 0d9dae8..ef31ed3 100644
>--- a/mingw-pdcurses.spec
>+++ b/mingw-pdcurses.spec
>@@ -1,9 +1,11 @@
>-%define __strip %{mingw32_strip}
>-%define __objdump %{mingw32_objdump}
>+%?mingw_package_header
>+
>+%global mingw_build_win32 1
>+%global mingw_build_win64 1
> 
> Name:           mingw-pdcurses
> Version:        3.4
>-Release:        11%{?dist}
>+Release:        12%{?dist}
> Summary:        Curses library for MinGW
> 
> License:        Public Domain
>@@ -15,10 +17,15 @@ BuildArch:      noarch
> 
> Patch0:         mingw32-pdcurses-3.4-build.patch
> 
>-BuildRequires:  mingw32-filesystem
>+BuildRequires:  mingw32-filesystem >= 95
> BuildRequires:  mingw32-gcc
> BuildRequires:  mingw32-binutils
> 
>+BuildRequires:  mingw64-filesystem >= 95
>+BuildRequires:  mingw64-gcc
>+BuildRequires:  mingw64-binutils
>+
>+%?mingw_debug_package
> 
> %description
> PDCurses is a public domain curses library for DOS, OS/2, Win32, X11
>@@ -33,7 +40,7 @@ don't use any of the extensions specific to ncurses.
> 
> 
> %package -n mingw32-pdcurses
>-Summary:        Curses library for MinGW
>+Summary:        Curses library for MinGW64
> 
> %description -n mingw32-pdcurses
> PDCurses is a public domain curses library for DOS, OS/2, Win32, X11
>@@ -46,20 +53,43 @@ Note that ncurses is not available for MinGW / Windows.  Applications
> which need curses functionality can use this package, provided they
> don't use any of the extensions specific to ncurses.
> 
>+%package -n mingw64-pdcurses
>+Summary:        Curses library for MinGW64
>+
>+%description -n mingw64-pdcurses
>+PDCurses is a public domain curses library for DOS, OS/2, Win32, X11
>+and SDL, implementing most of the functions available in X/Open and
>+System V R4 curses. It supports many compilers for these
>+platforms. The X11 port lets you recompile existing text-mode curses
>+programs to produce native X11 applications.
>+
>+Note that ncurses is not available for MinGW / Windows.  Applications
>+which need curses functionality can use this package, provided they
>+don't use any of the extensions specific to ncurses.
>+
> 
> %prep
> %setup -q -n PDCurses-%{version}
> %patch0 -p1
> 
>+cp -a win32 win64
> 
> %build
> pushd win32
> make -f mingwin32.mak \
>   CC=%{mingw32_cc} \
>   LINK=%{mingw32_cc} \
>+  STRIP=%{mingw32_strip} \
>   WIDE=Y UTF8=Y DLL=Y
> popd
> 
>+pushd win64
>+make -f mingwin32.mak \
>+  CC=%{mingw64_cc} \
>+  LINK=%{mingw64_cc} \
>+  STRIP=%{mingw64_strip} \
>+  WIDE=Y UTF8=Y DLL=Y
>+popd
> 
> %install
> mkdir -p $RPM_BUILD_ROOT%{mingw32_bindir}
>@@ -72,6 +102,16 @@ install win32/pdcurses.a $RPM_BUILD_ROOT%{mingw32_libdir}/libpdcurses.dll.a
> install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{mingw32_includedir}
> 
> 
>+mkdir -p $RPM_BUILD_ROOT%{mingw64_bindir}
>+mkdir -p $RPM_BUILD_ROOT%{mingw64_libdir}
>+mkdir -p $RPM_BUILD_ROOT%{mingw64_includedir}
>+
>+install win64/*.exe $RPM_BUILD_ROOT%{mingw64_bindir}
>+install win64/pdcurses.dll $RPM_BUILD_ROOT%{mingw64_bindir}/pdcurses.dll
>+install win64/pdcurses.a $RPM_BUILD_ROOT%{mingw64_libdir}/libpdcurses.dll.a
>+install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{mingw64_includedir}
>+
>+
> %files -n mingw32-pdcurses
> %{mingw32_bindir}/pdcurses.dll
> %{mingw32_libdir}/libpdcurses.dll.a
>@@ -87,8 +127,27 @@ install -m 0644 curses.h panel.h term.h $RPM_BUILD_ROOT%{mingw32_includedir}
> %{mingw32_bindir}/xmas.exe
> %{mingw32_bindir}/worm.exe
> 
>+%files -n mingw64-pdcurses
>+%{mingw64_bindir}/pdcurses.dll
>+%{mingw64_libdir}/libpdcurses.dll.a
>+%{mingw64_includedir}/curses.h
>+%{mingw64_includedir}/panel.h
>+%{mingw64_includedir}/term.h
>+%{mingw64_bindir}/firework.exe
>+%{mingw64_bindir}/newdemo.exe
>+%{mingw64_bindir}/ptest.exe
>+%{mingw64_bindir}/rain.exe
>+%{mingw64_bindir}/testcurs.exe
>+%{mingw64_bindir}/tuidemo.exe
>+%{mingw64_bindir}/xmas.exe
>+%{mingw64_bindir}/worm.exe
>+
> 
> %changelog
>+* Fri Apr 20 2012 Ralf CorsÃ©pius <corsepiu@fedoraproject.org> - 3.4-12
>+- Add mingw64.
>+- Rework patch
>+
> * Wed Mar 07 2012 Kalev Lember <kalevlember@gmail.com> - 3.4-11
> - Renamed the source package to mingw-pdcurses (#801012)
> - Modernize the spec file
>diff --git a/mingw32-pdcurses-3.4-build.patch b/mingw32-pdcurses-3.4-build.patch
>index d111632..26cf3a1 100644
>--- a/mingw32-pdcurses-3.4-build.patch
>+++ b/mingw32-pdcurses-3.4-build.patch
>@@ -1,6 +1,15 @@
>---- PDCurses-3.4/win32/mingwin32.mak.orig	2008-09-25 15:30:14.000000000 +0100
>-+++ PDCurses-3.4/win32/mingwin32.mak	2008-09-25 15:43:50.000000000 +0100
>-@@ -30,8 +30,8 @@
>+diff -Naur PDCurses-3.4.orig/win32/mingwin32.mak PDCurses-3.4.hacked/win32/mingwin32.mak
>+--- PDCurses-3.4.orig/win32/mingwin32.mak	2008-07-21 14:31:36.000000000 +0200
>++++ PDCurses-3.4.hacked/win32/mingwin32.mak	2012-04-20 15:28:55.071506378 +0200
>+@@ -19,6 +19,7 @@
>+ PDCURSES_WIN_H	= $(osdir)/pdcwin.h
>+ 
>+ CC		= gcc
>++STRIP		= strip
>+ 
>+ ifeq ($(DEBUG),Y)
>+ 	CFLAGS  = -g -Wall -DPDCDEBUG
>+@@ -30,8 +31,8 @@
>  
>  CFLAGS += -I$(PDCURSES_SRCDIR)
>  
>@@ -11,16 +20,16 @@
>  
>  DEFDEPS		= $(BASEDEF)
>  
>-@@ -50,7 +50,7 @@
>+@@ -50,7 +51,7 @@
>  
>  ifeq ($(DLL),Y)
>  	CFLAGS += -DPDC_DLL_BUILD
> -	LIBEXE = gcc $(DEFFILE)
>-+	LIBEXE = i686-w64-mingw32-gcc $(DEFFILE)
>++	LIBEXE = $(CC) $(DEFFILE)
>  	LIBFLAGS = -Wl,--out-implib,pdcurses.a -shared -o
>  	LIBCURSES = pdcurses.dll
>  	LIBDEPS = $(LIBOBJS) $(PDCOBJS) $(DEFFILE)
>-@@ -70,24 +70,24 @@
>+@@ -70,24 +71,24 @@
>  libs:	$(LIBCURSES)
>  
>  clean:
>@@ -33,7 +42,7 @@
>  
>  demos:	$(DEMOS)
> -	strip *.exe
>-+	i686-w64-mingw32-strip *.exe
>++	$(STRIP) *.exe
>  
>  $(DEFFILE): $(DEFDEPS)
>  	echo LIBRARY pdcurses > $@

Actions: View | Diff

Attachments on bug 814512: 579005