Update to gfract-1.0.
This commit is contained in:
ajacoutot
parent
608c5f4eb2
commit
5a00e648a7
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2016/01/06 20:02:19 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2016/10/28 13:45:22 ajacoutot Exp $
|
||||
|
||||
COMMENT= fractal program with GTK interface
|
||||
GH_ACCOUNT= oskusalerma
|
||||
GH_PROJECT= gfract
|
||||
GH_TAGNAME= v0.33
|
||||
REVISION= 13
|
||||
GH_TAGNAME= v1.0
|
||||
DISTFILES= ${DISTNAME}.tar.gz \
|
||||
gfract-palettes-0.1.tar.gz:0
|
||||
CATEGORIES= graphics math
|
||||
@ -14,17 +13,24 @@ HOMEPAGE= http://www.oskusoft.com/osku/gfract/
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
|
||||
WANTLIB += Xrandr Xrender atk-1.0 boost_filesystem boost_regex
|
||||
WANTLIB += boost_system c cairo fontconfig freetype gdk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
|
||||
WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread
|
||||
WANTLIB += stdc++ z
|
||||
|
||||
MASTER_SITES0= http://distfiles.nl/
|
||||
|
||||
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
|
||||
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
|
||||
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
|
||||
WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += png pthread stdc++ z
|
||||
MODULES= lang/python
|
||||
|
||||
LIB_DEPENDS= x11/gtk+2
|
||||
MODPY_RUNDEP= No
|
||||
MODPY_ADJ_FILES= make_palettes.py
|
||||
# override python module CONFIGURE_STYLE
|
||||
CONFIGURE_STYLE= none # empty
|
||||
|
||||
MODULES= devel/gettext
|
||||
LIB_DEPENDS= devel/boost \
|
||||
x11/gtk+2
|
||||
|
||||
USE_GMAKE= Yes
|
||||
|
||||
@ -35,10 +41,10 @@ ALL_TARGET= gfract
|
||||
MAKE_FLAGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
|
||||
|
||||
post-extract:
|
||||
@cd ${WRKDIR} && mv monk2\'.map monk2.map
|
||||
cd ${WRKDIR} && mv monk2\'.map monk2.map
|
||||
|
||||
pre-build:
|
||||
@sed -i 's,/usr/local,${LOCALBASE},' ${WRKSRC}/main.cpp
|
||||
sed -i 's,/usr/local,${LOCALBASE},' ${WRKSRC}/main.cpp
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/gfract/palettes
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
SHA256 (gfract-0.33.tar.gz) = BBwCweUYgk1yb5cjqWjS3dFbzePVvIasmCY08rJqH88=
|
||||
SHA256 (gfract-1.0.tar.gz) = dQUyuNSs2AMdDiDfmorOJL2+SAHhxOi8v5/JCH65omk=
|
||||
SHA256 (gfract-palettes-0.1.tar.gz) = u8M1ObIMUAli/mVKwBLL51HUVXaMqGL+dCnL2iETMrE=
|
||||
SIZE (gfract-0.33.tar.gz) = 33197
|
||||
SIZE (gfract-1.0.tar.gz) = 57614
|
||||
SIZE (gfract-palettes-0.1.tar.gz) = 223648
|
||||
|
||||
@ -1,30 +1,26 @@
|
||||
$OpenBSD: patch-Makefile,v 1.4 2010/09/30 07:26:04 ajacoutot Exp $
|
||||
|
||||
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
|
||||
|
||||
--- Makefile.orig Tue Apr 18 17:31:44 2006
|
||||
+++ Makefile Thu Sep 30 08:33:08 2010
|
||||
@@ -2,8 +2,7 @@ PROG := gfract
|
||||
$OpenBSD: patch-Makefile,v 1.5 2016/10/28 13:45:22 ajacoutot Exp $
|
||||
--- Makefile.orig Mon Feb 1 13:31:34 2010
|
||||
+++ Makefile Thu Oct 27 14:58:32 2016
|
||||
@@ -10,7 +10,7 @@ ICON_FILES := mandel_icon.pix
|
||||
|
||||
CXX := g++
|
||||
|
||||
-DEFS := -Wall -ansi -pedantic -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATED \
|
||||
- -DGTK_DISABLE_DEPRECATED
|
||||
+DEFS := -Wall -ansi -pedantic -D_GNU_SOURCE
|
||||
|
||||
-DEFS := -Wall -ansi -pedantic -D_REENTRANT -D_GNU_SOURCE
|
||||
+DEFS := -Wall -ansi -D_REENTRANT -D_GNU_SOURCE
|
||||
DEFS := $(shell pkg-config --cflags gtk+-2.0 libpng) $(DEFS)
|
||||
|
||||
@@ -19,11 +18,11 @@ HEADERS := $(wildcard *.h *.xpm)
|
||||
CXXFLAGS := $(DEFS) -O2 -fomit-frame-pointer -ffast-math
|
||||
@@ -24,11 +24,11 @@ PALETTES := $(wildcard palettes/*.map)
|
||||
|
||||
$(PROG): $(OBJS)
|
||||
@echo Linking $(PROG)
|
||||
- @$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $(PROG)
|
||||
+ $(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $(PROG)
|
||||
$(GTK_FRONTEND): $(GTK_FRONTEND_OBJS)
|
||||
@echo Linking $(GTK_FRONTEND)
|
||||
- @$(CXX) $(CXXFLAGS) $(GTK_FRONTEND_OBJS) $(LDFLAGS) -o $(GTK_FRONTEND)
|
||||
+ $(CXX) $(CXXFLAGS) $(DEFS) $(GTK_FRONTEND_OBJS) $(LDFLAGS) -o $(GTK_FRONTEND)
|
||||
|
||||
%.o: %.cpp $(HEADERS)
|
||||
%.o: %.cpp $(HEADERS) Makefile
|
||||
@echo Compiling $<
|
||||
- @$(CXX) $(CXXFLAGS) -c $< -o $@
|
||||
+ $(CXX) $(DEFS) $(CXXFLAGS) -c $< -o $@
|
||||
+ $(CXX) $(CXXFLAGS) $(DEFS) -c $< -o $@
|
||||
|
||||
clean:
|
||||
rm -f $(PROG) $(OBJS)
|
||||
palettes.cpp: make_palettes.py $(PALETTES)
|
||||
./make_palettes.py
|
||||
|
||||
21
graphics/gfract/patches/patch-main_cpp
Normal file
21
graphics/gfract/patches/patch-main_cpp
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-main_cpp,v 1.1 2016/10/28 13:45:22 ajacoutot Exp $
|
||||
--- main.cpp.orig Mon Feb 1 13:31:34 2010
|
||||
+++ main.cpp Thu Oct 27 15:10:55 2016
|
||||
@@ -340,7 +340,7 @@ void load_palette_cmd(void)
|
||||
|
||||
void load_builtin_palette_cmd(void* arg)
|
||||
{
|
||||
- int n = reinterpret_cast<int>(arg);
|
||||
+ int n = *((int*)(&arg));
|
||||
|
||||
palette_load_builtin(n);
|
||||
reapply_palette();
|
||||
@@ -1001,7 +1001,7 @@ void load_config()
|
||||
{
|
||||
using namespace boost::filesystem;
|
||||
|
||||
- if (!exists(path(cfgFilename, native)))
|
||||
+ if (!exists(path(cfgFilename)))
|
||||
{
|
||||
return;
|
||||
}
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-my_png_cpp,v 1.1 2011/07/08 20:38:01 naddy Exp $
|
||||
$OpenBSD: patch-my_png_cpp,v 1.2 2016/10/28 13:45:22 ajacoutot Exp $
|
||||
|
||||
Fix build with png-1.5.
|
||||
|
||||
--- my_png.cpp.orig Wed Jul 6 15:34:02 2011
|
||||
+++ my_png.cpp Wed Jul 6 15:34:19 2011
|
||||
@@ -58,7 +58,7 @@ void save_file(image_info* img, char* filename)
|
||||
--- my_png.cpp.orig Mon Feb 1 13:31:34 2010
|
||||
+++ my_png.cpp Thu Oct 27 14:50:22 2016
|
||||
@@ -53,7 +53,7 @@ void my_png_save_img(image_info* img, char* filename)
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user