From ba8c9c182730096801d07047440b1b1cdb0dafc9 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 7 Feb 2014 17:28:07 +0100 Subject: [PATCH] - new URLs, updated to 3.1.4 - updated PLD patch - added fixes patch (misc compilation fixes) - added verbose patch (avoid hiding compiler commands) - added giflib,libmng,libpng patches (fix build with recent versions of resp. libraries) --- endeavour-PLD.patch | 239 ++++++++++--------- endeavour-fixes.patch | 33 +++ endeavour-giflib.patch | 517 ++++++++++++++++++++++++++++++++++++++++ endeavour-libmng.patch | 11 + endeavour-libpng.patch | 25 ++ endeavour-verbose.patch | 448 ++++++++++++++++++++++++++++++++++ endeavour.spec | 174 +++++++++----- 7 files changed, 1279 insertions(+), 168 deletions(-) create mode 100644 endeavour-fixes.patch create mode 100644 endeavour-giflib.patch create mode 100644 endeavour-libmng.patch create mode 100644 endeavour-libpng.patch create mode 100644 endeavour-verbose.patch diff --git a/endeavour-PLD.patch b/endeavour-PLD.patch index 857ba7e..5d89117 100644 --- a/endeavour-PLD.patch +++ b/endeavour-PLD.patch @@ -1,24 +1,16 @@ -diff -uNr endeavour-2.5.6.orig/endeavour2/config.h endeavour-2.5.6.pld/endeavour2/config.h ---- endeavour-2.5.6.orig/endeavour2/config.h 2005-10-07 09:01:48.000000000 +0200 -+++ endeavour-2.5.6.pld/endeavour2/config.h 2005-12-14 09:21:25.005740728 +0100 -@@ -343,13 +343,13 @@ +--- endeavour-3.1.4/endeavour2/config.h.orig 2014-02-02 19:38:07.061469313 +0100 ++++ endeavour-3.1.4/endeavour2/config.h 2014-02-02 19:41:30.348127450 +0100 +@@ -431,8 +431,8 @@ + # define EDV_PATH_PROG_DEF_TERMINAL "x-terminal-emulator" + # define EDV_CMD_DEF_TERMINAL_RUN "x-terminal-emulator -e" + #else +-# define EDV_PATH_PROG_DEF_TERMINAL "/usr/X11R6/bin/xterm" +-# define EDV_CMD_DEF_TERMINAL_RUN "/usr/X11R6/bin/xterm -e" ++# define EDV_PATH_PROG_DEF_TERMINAL "/usr/bin/xterm" ++# define EDV_CMD_DEF_TERMINAL_RUN "/usr/bin/xterm -e" #endif - #define EDV_DEF_FORMAT_FRONT_PROG EDV_DEF_GLOBAL_ARCHDEP_DATA_DIR \ -- "/bin/format.front" -+ "/format.front" - #define EDV_DEF_FSCK_FRONT_PROG EDV_DEF_GLOBAL_ARCHDEP_DATA_DIR \ -- "/bin/fsck.front" -+ "/fsck.front" - #define EDV_DEF_ZIPTOOL_FRONT_PROG EDV_DEF_GLOBAL_ARCHDEP_DATA_DIR \ -- "/bin/ziptool.front" -+ "/ziptool.front" - #define EDV_DEF_DOWNLOAD_FRONT_PROG EDV_DEF_GLOBAL_ARCHDEP_DATA_DIR \ -- "/bin/download.front" -+ "/download.front" - #define EDV_DEF_MAIL_CLIENT_PROG "/usr/bin/balsa" - - + #define EDV_PATH_PROG_DEF_FORMAT_FRONT EDV_PATH_DEF_GLOBAL_LIB_DIR \ diff -uNr endeavour-2.5.6.orig/endeavour2/edvcore.c endeavour-2.5.6.pld/endeavour2/edvcore.c --- endeavour-2.5.6.orig/endeavour2/edv_core.c 2005-10-07 09:01:51.000000000 +0200 +++ endeavour-2.5.6.pld/endeavour2/edv_core.c 2005-12-23 15:27:37.817417472 +0100 @@ -34,99 +26,132 @@ diff -uNr endeavour-2.5.6.orig/endeavour2/edvcore.c endeavour-2.5.6.pld/endeavou #else EDV_SET_S( EDV_CFG_PARM_FILE_MIME_TYPES, -diff -uNr endeavour-2.5.6.orig/endeavour2/lib/endeavour2-config.c endeavour-2.5.6.pld/endeavour2/lib/endeavour2-config.c ---- endeavour-2.5.6.orig/endeavour2/lib/endeavour2-config.c 2005-10-07 09:01:45.000000000 +0200 -+++ endeavour-2.5.6.pld/endeavour2/lib/endeavour2-config.c 2005-12-22 14:55:50.856055776 +0100 -@@ -24,7 +24,7 @@ - +--- endeavour-3.1.4/endeavour2/libendeavour2-base/endeavour2-base-config.c.orig 2014-02-02 19:50:52.794770512 +0100 ++++ endeavour-3.1.4/endeavour2/libendeavour2-base/endeavour2-base-config.c 2014-02-02 19:50:55.814770386 +0100 +@@ -8,7 +8,7 @@ + #include + #include "config.h" - #define CFLAGS "\ ---I/usr/lib/endeavour2/include" -+-I/usr/include/endeavour2" +-#define CFLAGS "-I/usr/lib/endeavour2/include" ++#define CFLAGS "-I/usr/include/endeavour2" - #define LIBS "\ - -lendeavour2" -diff -uNr endeavour-2.5.6.orig/endeavour2/lib/Makefile endeavour-2.5.6.pld/endeavour2/lib/Makefile ---- endeavour-2.5.6.orig/endeavour2/lib/Makefile 2005-10-07 09:01:45.000000000 +0200 -+++ endeavour-2.5.6.pld/endeavour2/lib/Makefile 2005-12-22 14:25:24.112762968 +0100 -@@ -70,8 +70,8 @@ - BIN_DIR = $(PREFIX)/bin - LIB_DIR = $(PREFIX)/lib - EDV_ARCH_DIR = $(PREFIX)/lib/endeavour2 --EDV_INCLUDE_DIR = $(PREFIX)/lib/endeavour2/include --EDV_LIB_DIR = $(PREFIX)/lib/endeavour2/lib -+EDV_INCLUDE_DIR = $(PREFIX)/include/endeavour2/ -+EDV_LIB_DIR = $(PREFIX)/lib/ + #define LIBS "-lendeavour2-base" - - # Compile time information export: -diff -uNr endeavour-2.5.6.orig/endeavour2/platforms.ini endeavour-2.5.6.pld/endeavour2/platforms.ini ---- endeavour-2.5.6.orig/endeavour2/platforms.ini 2005-10-07 09:02:02.000000000 +0200 -+++ endeavour-2.5.6.pld/endeavour2/platforms.ini 2005-12-23 12:04:27.893567576 +0100 -@@ -285,6 +285,66 @@ +--- endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile.orig 2014-02-02 19:55:48.408091441 +0100 ++++ endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile 2014-02-02 20:09:25.538057149 +0100 +@@ -6,8 +6,8 @@ + MAN1_DIR = $(PREFIX)/man/man1 + MAN3_DIR = $(PREFIX)/man/man3 + EDV_ARCH_DIR = $(PREFIX)/lib/endeavour2 +-EDV_INCLUDE_DIR = $(PREFIX)/lib/endeavour2/include +-EDV_LIB_DIR = $(PREFIX)/lib/endeavour2/lib ++EDV_INCLUDE_DIR = $(PREFIX)/include/endeavour2 ++EDV_LIB_DIR = $(LIB_DIR) + LIB = libendeavour2-base.so + LIB_CFG_BIN = endeavour2-base-config + LIB_CFG_MAN = endeavour2-base-config.1.bz2 +--- endeavour-3.1.4/endeavour2/platforms.ini.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/platforms.ini 2014-02-04 16:46:12.354650452 +0100 +@@ -410,20 +410,14 @@ + Platform = Linux + Description = For most any Linux system + PREFIX = /usr +- CFLAGS = -Wall -O2 -DNEED_STRCASESTR ++ CFLAGS = $(OPTCFLAGS) -Wall + LIBS = -lendeavour2-base -lm + LIB_DIR = -L./libendeavour2-base + CC = cc + CPP = c++ + PlatformSearchPathInclude = /usr/include +- PlatformSearchPathInclude = /usr/X11R6/include +- PlatformSearchPathInclude = /usr/local/include +- PlatformSearchPathInclude = /opt/gnome/include + PlatformSearchPathLib = /lib + PlatformSearchPathLib = /usr/lib +- PlatformSearchPathLib = /usr/X11R6/lib +- PlatformSearchPathLib = /usr/local/lib +- PlatformSearchPathLib = /opt/gnome/lib + PlatformSearchPathEtc = /etc + PlatformSearchPathEtc = /usr/etc + PlatformSearchPathEtc = /usr/local/etc +@@ -432,45 +426,12 @@ + PlatformSearchPathBin = /usr/X11R6/bin + PlatformSearchPathBin = /usr/local/bin + PlatformSearchPathBin = /usr/games +- PlatformSearchPathBin = /opt/gnome/bin + PlatformSearchPathData = /usr/share/icons + PlatformSearchPathData = /usr/share/games + PlatformFeature = debug + Description = Just adds -g to the CFLAGS for debugging + MustExist = No + FeatureCFLAGS = -g +- PlatformFeature = arch-i486 +- Description = Adds -march=i486 for 486 specific optimizations +- MustExist = Preferred +- FeatureCFLAGS = -march=i486 +- FeatureDepend = i486 +- DependType = Machine +- MustExist = Yes +- DependMachine = i486 +- PlatformFeature = arch-i586 +- Description = Adds -march=i586 for Pentium specific optimizations +- MustExist = Preferred +- FeatureCFLAGS = -march=i586 +- FeatureDepend = i586 +- DependType = Machine +- MustExist = Yes +- DependMachine = i586 +- PlatformFeature = arch-i686 +- Description = Adds -march=i686 for Pentium Pro specific optimizations +- MustExist = Preferred +- FeatureCFLAGS = -march=i686 +- FeatureDepend = i686 +- DependType = Machine +- MustExist = Yes +- DependMachine = i686 +- PlatformFeature = arch-pentiumpro +- Description = Adds -march=pentiumpro for Pentium Pro specific optimizations +- MustExist = Preferred +- FeatureCFLAGS = -march=pentiumpro +- FeatureDepend = pentiumpro +- DependType = Machine +- MustExist = Yes +- DependMachine = pentiumpro + PlatformFeature = libz + Description = GNU Z Compression/Decompression Library + MustExist = Preffered +@@ -591,7 +552,6 @@ + MustExist = Preffered + FeatureCFLAGS = -DHAVE_LIBXPM + FeatureLIBS = -lXpm +- FeatureLIB_DIR = -L/usr/X11R6/lib/ + FeatureDepend = libxpm-devel + DependType = Header + MustExist = Yes +@@ -611,11 +571,10 @@ + MustExist = Preferred + FeatureCFLAGS = -DHAVE_XF86_VIDMODE + FeatureLIBS = -lXxf86vm +- FeatureLIB_DIR = -L/usr/X11R6/lib/ + FeatureDepend = xf86vidmode-lib + DependType = Library + MustExist = Yes +- DependPath = libXxf86vm.a ++ DependPath = libXxf86vm.so + DependGrepString = XF86VidModeQueryExtension + FeatureDepend = xf86vidmode-devel + DependType = Header +@@ -627,13 +586,11 @@ + MustExist = Yes + FeatureCFLAGS = `gtk-config --cflags` + FeatureLIBS = `gtk-config --libs` +- FeatureLIB_DIR = -L/usr/X11R6/lib + FeatureDepend = gtk-devel + DependType = Program MustExist = Yes DependPath = gtk-config -+# PLD/Linux -+# autor Micha³ Abramowicz -+# 14.12.2005 -+Platform = PLD -+ Description = For PLD Linux (http://www.pld-linux.org) -+ PREFIX = /usr -+ CFLAGS = $(OPTCFLAGS) -+ LIBS = -lm -+ LIB_DIR = -+ CC = gcc -+ CPP = g++ -+ PlatformSearchPathInclude = /usr/include -+ PlatformSearchPathInclude = /usr/X11R6/include -+ PlatformSearchPathLib = /lib -+ PlatformSearchPathLib = /usr/lib -+ PlatformSearchPathLib = /usr/X11R6/lib -+ PlatformSearchPathEtc = /etc -+ PlatformSearchPathBin = /usr/bin -+ PlatformSearchPathBin = /usr/X11R6/bin -+ PlatformSearchPathData = /usr/share/icons -+ PlatformFeature = libgif -+ Description = Uncompressed GIF Library -+ MustExist = Preffered -+ FeatureCFLAGS = -DHAVE_LIBGIF -+ FeatureLIBS = -lgif -+ FeatureDepend = libgif-devel -+ DependType = Header -+ MustExist = Yes -+ DependPath = gif_lib.h -+ DependGrepString = DGifOpenFileName -+ PlatformFeature = XF86VidMode -+ Description = XF86 Video Mode extension -+ MustExist = Preferred -+ FeatureCFLAGS = -DHAVE_XF86_VIDMODE -+ FeatureLIBS = -lXxf86vm -+ FeatureLIB_DIR = -L/usr/X11R6/lib/ -+ FeatureDepend = xf86vidmode-devel -+ DependType = Header -+ MustExist = Yes -+ DependPath = X11/extensions/xf86vmode.h -+ DependGrepString = XF86VidModeQueryExtension -+ PlatformFeature = Imlib -+ Description = Image library -+ MustExist = Preffered -+ FeatureCFLAGS = `imlib-config --cflags` -DHAVE_IMLIB -+ FeatureLIBS = `imlib-config --libs` -+ FeatureDepend = Imlib-devel -+ DependType = Program -+ MustExist = Yes -+ DependPath = imlib-config -+ PlatformFeature = libgtk -+ Description = GTK+ 1.2.x -+ MustExist = Yes -+ FeatureCFLAGS = `gtk-config --cflags` -+ FeatureLIBS = `gtk-config --libs` -+ FeatureLIB_DIR = -L/usr/X11R6/lib -+ FeatureDepend = gtk-devel -+ DependType = Program -+ MustExist = Yes -+ DependPath = gtk-config - +- # Debian GNU/Linux # + # Author: Christoph Berg diff --git a/endeavour-fixes.patch b/endeavour-fixes.patch new file mode 100644 index 0000000..f7ce2f8 --- /dev/null +++ b/endeavour-fixes.patch @@ -0,0 +1,33 @@ +--- endeavour-3.1.4/endeavour2/libendeavour2-base/edv_utils.c.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/libendeavour2-base/edv_utils.c 2014-02-02 20:57:30.127936094 +0100 +@@ -2190,7 +2190,8 @@ + */ + gint edv_sync(void) + { +- return(sync()); ++ sync(); ++ return 0; + } + + +--- endeavour-3.1.4/endeavour2/edv_types.h.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/edv_types.h 2014-02-02 21:48:04.661142079 +0100 +@@ -8,6 +8,7 @@ + #ifndef EDV_TYPES_H + #define EDV_TYPES_H + ++#include + + /* + * Size Format: +--- endeavour-3.1.4/endeavour2/edv_archive_extract_zip.c.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/edv_archive_extract_zip.c 2014-02-02 21:51:18.914467260 +0100 +@@ -1238,7 +1238,7 @@ + !STRISEMPTY(path) + ) + { +- (if(edv_archive_extract_update_progress_dialog( ++ if(edv_archive_extract_update_progress_dialog( + cfg_list, + s, + path, diff --git a/endeavour-giflib.patch b/endeavour-giflib.patch new file mode 100644 index 0000000..527d636 --- /dev/null +++ b/endeavour-giflib.patch @@ -0,0 +1,517 @@ +--- endeavour-3.1.4/endeavour2/imgio_gif.c.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/imgio_gif.c 2014-02-03 18:55:20.501284490 +0100 +@@ -41,9 +41,9 @@ + + /* Error Code To String */ + static const char *ImgGIFErrorStringDecode(const int gif_error_code); +-#define DGIF_STR_ERROR ImgGIFErrorStringDecode ++#define DGIF_STR_ERROR GifErrorString + static const char *ImgGIFErrorStringEncode(const int gif_error_code); +-#define EGIF_STR_ERROR ImgGIFErrorStringEncode ++#define EGIF_STR_ERROR GifErrorString + + /* Open */ + static int ImgReadGIFReadCB( +@@ -492,7 +492,7 @@ + #define MIN(a,b) (((a) < (b)) ? (a) : (b)) + #define CLIP(a,l,h) (MIN(MAX((a),(l)),(h))) + #define STRLEN(s) (((s) != NULL) ? strlen(s) : 0) +-#define STRISEMPTY(s) (((s) != NULL) ? (*(s) == '\0') : TRUE) ++#define STRISEMPTY(s) (((s) != NULL) ? (*(s) == '\0') : true) + + + /* +@@ -500,29 +500,12 @@ + */ + void ImgGIFVersion(int *major, int *minor, int *release) + { +- const char *ver_str = GIF_LIB_VERSION, *s; +- +- s = strstr(ver_str, "Version"); +- while((*s != '\0') && (*s != ' ')) +- s++; +- while(*s == ' ') +- s++; + if(major != NULL) +- *major = ATOI(s); +- +- while((*s != '\0') && (*s != '.')) +- s++; +- while(*s == '.') +- s++; ++ *major = GIFLIB_MAJOR; + if(minor != NULL) +- *minor = ATOI(s); +- +- while((*s != '\0') && (*s != '.')) +- s++; +- while(*s == '.') +- s++; ++ *minor = GIFLIB_MINOR; + if(release != NULL) +- *release = ATOI(s); ++ *release = GIFLIB_RELEASE; + } + + +@@ -986,7 +969,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_file->Error)); + status = -1; + break; + } +@@ -1076,7 +1059,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_file->Error)); + status = -1; + break; + } +@@ -1107,7 +1090,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_file->Error)); + status = -1; + break; + } +@@ -1235,7 +1218,7 @@ + } + else + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_file->Error)); + status = -1; + } + break; +@@ -1391,7 +1374,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_file->Error)); + status = -1; + get_error_need_break = 1; + break; +@@ -1421,7 +1404,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_file->Error)); + status = -1; + break; + } +@@ -1429,7 +1412,7 @@ + } + else + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_file->Error)); + status = -1; + } + } +@@ -1469,7 +1452,8 @@ + { + const int bpp = 4; /* RGBA */ + int i, +- gif_status; ++ gif_status, ++ gif_error; + GifFileType *gif_file; + GifRowType gif_screen_row; + ImgGIFReadContext *ctx = NULL; +@@ -1629,11 +1613,12 @@ + */ + ctx->gif_file = gif_file = DGifOpen( + ctx, +- ImgReadGIFReadCB ++ ImgReadGIFReadCB, ++ &gif_error + ); + if(gif_file == NULL) + { +- ImgOpenSetError(DGIF_STR_ERROR(GifLastError())); ++ ImgOpenSetError(DGIF_STR_ERROR(gif_error)); + CLEANUP_RETURN(-1); + } + +@@ -1778,12 +1763,13 @@ + + /* End the GIF decoding */ + gif_status = DGifCloseFile(ctx->gif_file); +- ctx->gif_file = NULL; + if(gif_status != GIF_OK) + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(ctx->gif_file->Error)); ++ free(ctx->gif_file); + ctx->status = -1; + } ++ ctx->gif_file = NULL; + + if(*ctx->user_aborted) + { +@@ -1974,7 +1960,8 @@ + { + const int bpp = 4; /* RGBA */ + int i, +- gif_status; ++ gif_status, ++ gif_error; + GifFileType *gif_file; + GifRowType gif_screen_row; + ImgGIFReadContext *ctx = NULL; +@@ -2132,11 +2119,12 @@ + */ + ctx->gif_file = gif_file = DGifOpen( + ctx, +- ImgReadGIFReadCB ++ ImgReadGIFReadCB, ++ &gif_error + ); + if(gif_file == NULL) + { +- ImgOpenSetError(DGIF_STR_ERROR(GifLastError())); ++ ImgOpenSetError(GifErrorString(gif_error)); + CLEANUP_RETURN(-1); + } + +@@ -2294,12 +2282,13 @@ + + /* End the GIF decoding */ + gif_status = DGifCloseFile(ctx->gif_file); +- ctx->gif_file = NULL; + if(gif_status != GIF_OK) + { +- ImgOpenSetError(DGIF_STR_ERROR(gif_status)); ++ ImgOpenSetError(DGIF_STR_ERROR(ctx->gif_file->Error)); ++ free(ctx->gif_file); + ctx->status = -1; + } ++ ctx->gif_file = NULL; + + /* Check for user abort */ + if(*ctx->user_aborted) +@@ -2770,7 +2759,7 @@ + } + + /* Create the GIF colormap from the colors list */ +- colormap = MakeMapObject( ++ colormap = GifMakeMapObject( + 256, /* Must be 256 or else fails */ + NULL + ); +@@ -2831,25 +2820,40 @@ + 0x00 /* Hi byte of a u_int16_t loop count */ + }; + +- int gif_status = EGifPutExtensionFirst( ++ int gif_status = EGifPutExtensionLeader( ++ ft, ++ APPLICATION_EXT_FUNC_CODE ++ ); ++ if(gif_status != GIF_OK) ++ { ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); ++ return(-1); ++ } ++ ++ gif_status = EGifPutExtensionBlock( + ft, +- APPLICATION_EXT_FUNC_CODE, + sizeof(buf), buf + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + return(-1); + } + +- gif_status = EGifPutExtensionLast( ++ gif_status = EGifPutExtensionBlock( + ft, +- APPLICATION_EXT_FUNC_CODE, + sizeof(buf2), buf2 + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); ++ return(-1); ++ } ++ ++ gif_status = EGifPutExtensionTrailer(ft); ++ if(gif_status != GIF_OK) ++ { ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + return(-1); + } + +@@ -3010,13 +3014,13 @@ + if((status2 != 0) || (colormap == NULL) || (cidx == NULL)) + { + if(colormap != NULL) +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + free(cidx); + continue; + } + if(*ctx->user_aborted) + { +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + free(cidx); + status = -4; + break; +@@ -3034,8 +3038,8 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); +- FreeMapObject(colormap); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); ++ GifFreeMapObject(colormap); + free(cidx); + status = -1; + break; +@@ -3048,7 +3052,7 @@ + { + if(ImgWriteGIFLoopingBlock(ft) != 0) + { +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + free(cidx); + status = -1; + break; +@@ -3087,8 +3091,8 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); +- FreeMapObject(colormap); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); ++ GifFreeMapObject(colormap); + free(cidx); + status = -1; + break; +@@ -3106,15 +3110,15 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); +- FreeMapObject(colormap); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); ++ GifFreeMapObject(colormap); + free(cidx); + status = -1; + break; + } + + /* Delete the GIF colormap */ +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + + /* Write the image data for this frame */ + if(ctx->interlaced) +@@ -3140,7 +3144,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3184,7 +3188,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3326,7 +3330,7 @@ + if(cidx == NULL) + { + const int error_code = errno; +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + imgio_last_save_error = "Memory allocation error"; + errno = error_code; + return(-3); +@@ -3398,7 +3402,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3447,7 +3451,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3463,7 +3467,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3491,7 +3495,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3535,7 +3539,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3566,7 +3570,7 @@ + } + + /* Delete the GIF colormap */ +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + + /* Delete the GIF color index image data */ + free(cidx); +@@ -3698,7 +3702,7 @@ + if(cidx == NULL) + { + const int error_code = errno; +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + imgio_last_save_error = "Memory allocation error"; + errno = error_code; + return(-3); +@@ -3770,7 +3774,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3819,7 +3823,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3835,7 +3839,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3865,7 +3869,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3910,7 +3914,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ft->Error)); + status = -1; + break; + } +@@ -3941,7 +3945,7 @@ + } + + /* Delete the GIF colormap */ +- FreeMapObject(colormap); ++ GifFreeMapObject(colormap); + + /* Delete the GIF color index image data */ + free(cidx); +@@ -3979,7 +3983,8 @@ + const int bpp = 4, /* RGBA */ + _bpl = (bpl > 0) ? bpl : width * bpp; + int user_aborted = 0, +- gif_status; ++ gif_status, ++ gif_error; + ImgGIFWriteContext *ctx; + + #define CLEANUP_RETURN(_v_) { \ +@@ -4108,11 +4113,12 @@ + */ + ctx->gif_file = EGifOpen( + ctx, +- ImgWriteGIFWriteCB ++ ImgWriteGIFWriteCB, ++ &gif_error + ); + if(ctx->gif_file == NULL) + { +- ImgSaveSetError(EGIF_STR_ERROR(GifLastError())); ++ ImgSaveSetError(EGIF_STR_ERROR(gif_error)); + CLEANUP_RETURN(-1); + } + +@@ -4150,7 +4156,7 @@ + ); + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ctx->gif_file->Error)); + ctx->status = -1; + } + } +@@ -4172,12 +4178,13 @@ + + /* End the GIF encoding */ + gif_status = EGifCloseFile(ctx->gif_file); +- ctx->gif_file = NULL; + if(gif_status != GIF_OK) + { +- ImgSaveSetError(EGIF_STR_ERROR(gif_status)); ++ ImgSaveSetError(EGIF_STR_ERROR(ctx->gif_file->Error)); ++ free(ctx->gif_file); + ctx->status = -1; + } ++ ctx->gif_file = NULL; + + if(*ctx->user_aborted) + { diff --git a/endeavour-libmng.patch b/endeavour-libmng.patch new file mode 100644 index 0000000..402c2f0 --- /dev/null +++ b/endeavour-libmng.patch @@ -0,0 +1,11 @@ +--- endeavour-3.1.4/endeavour2/imgio_mng.c.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/imgio_mng.c 2014-02-04 21:41:25.790573757 +0100 +@@ -1,6 +1,8 @@ + #ifdef HAVE_LIBMNG ++#define MNG_USE_SO + #include + #include ++#include + #include + #include + #include diff --git a/endeavour-libpng.patch b/endeavour-libpng.patch new file mode 100644 index 0000000..f9197b2 --- /dev/null +++ b/endeavour-libpng.patch @@ -0,0 +1,25 @@ +--- endeavour-3.1.4/endeavour2/imgio_png.c.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/imgio_png.c 2014-02-05 17:55:19.894183865 +0100 +@@ -1,6 +1,8 @@ + #ifdef HAVE_LIBPNG + #include + #include ++#include ++#include + #include + #include + #include +@@ -651,11 +653,11 @@ + + /* Get the PNG color type */ + ctx->png_color_type = color_type = ((png_info_ptr != NULL) ? +- png_info_ptr->color_type : PNG_COLOR_TYPE_GRAY ++ png_get_color_type(png_ptr, png_info_ptr) : PNG_COLOR_TYPE_GRAY + ); + + /* Get the PNG bit depth */ +- ctx->png_bit_depth = bit_depth = (png_info_ptr != NULL) ? png_info_ptr->bit_depth : 1; ++ ctx->png_bit_depth = bit_depth = (png_info_ptr != NULL) ? png_get_bit_depth(png_ptr, png_info_ptr) : 1; + + + /* Insert transformations here */ diff --git a/endeavour-verbose.patch b/endeavour-verbose.patch new file mode 100644 index 0000000..2e74659 --- /dev/null +++ b/endeavour-verbose.patch @@ -0,0 +1,448 @@ +--- endeavour-3.1.4/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/Makefile 2014-02-03 19:44:06.784495022 +0100 +@@ -49,7 +49,7 @@ + # + all config: + @for subdir in $(ALL_SRC_DIRS); do \ +- $(MAKE) -s -C $$subdir -f Makefile $@ || exit 1; \ ++ $(MAKE) -C $$subdir -f Makefile $@ || exit 1; \ + done + @echo "To install, type \"su\" (to gain root privileges)\ + and then type \"make install\"." +@@ -59,7 +59,7 @@ + # + install: + @for subdir in $(ALL_SRC_DIRS); do \ +- $(MAKE) -s -C $$subdir -f Makefile $@ || exit 1; \ ++ $(MAKE) -C $$subdir -f Makefile $@ || exit 1; \ + done + @echo "Installation done." + @echo " " +@@ -72,5 +72,5 @@ + # + clean: + @for subdir in $(ALL_SRC_DIRS); do \ +- $(MAKE) -s -C $$subdir -f Makefile $@; \ ++ $(MAKE) -C $$subdir -f Makefile $@; \ + done +--- endeavour-3.1.4/endeavour2/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/Makefile 2014-02-03 20:08:41.257766475 +0100 +@@ -55,11 +55,9 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): prebuild config modules postbuild +@@ -69,9 +67,7 @@ + @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) +- @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB_DIRS) $(LIBS) +- @echo -n " " ++ $(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB_DIRS) $(LIBS) + @-$(LS) $(LSFLAGS) $(BIN) + + prebuild: +--- endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile.orig 2014-02-03 18:58:04.214610957 +0100 ++++ endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile 2014-02-03 20:13:18.457754842 +0100 +@@ -86,11 +86,9 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(LIB): prebuild config modules $(LIB_CFG_BIN) postbuild +@@ -100,9 +98,7 @@ + @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) +- @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) $(LIB_DIRS) $(LIBS) -shared -o $(LIB) +- @echo -n " " ++ $(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) $(LIB_DIRS) $(LIBS) -shared -o $(LIB) + @-$(LS) $(LSFLAGS) $(LIB) + + prebuild: +--- endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile.orig 2014-02-06 21:12:31.496728142 +0100 ++++ endeavour-3.1.4/endeavour2/libendeavour2-base/Makefile 2014-02-07 15:17:50.273995367 +0100 +@@ -95,7 +95,7 @@ + + config: + @echo "Compiling resources" +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + $(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) $(LIB_DIRS) $(LIBS) -shared -o $(LIB) +@@ -109,7 +109,7 @@ + + $(LIB_CFG_BIN): + @echo -n "Compiling configuration program..." +- @$(CC) -O2 -g -Wall $(LIB_CFG_BIN).c \ ++ $(CC) -O2 -g -Wall $(LIB_CFG_BIN).c \ + -o $(LIB_CFG_BIN) + @echo -n " " + @-$(LS) $(LSFLAGS) $(LIB_CFG_BIN) +--- endeavour-3.1.4/endeavour2/Makefile.orig 2014-02-06 21:12:31.496728142 +0100 ++++ endeavour-3.1.4/endeavour2/Makefile 2014-02-07 15:18:35.210660148 +0100 +@@ -64,7 +64,7 @@ + + config: + @echo "Compiling resources" +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + $(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIB_DIRS) $(LIBS) +--- endeavour-3.1.4/endeavour2/download.front/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/download.front/Makefile 2014-02-07 16:11:35.817193336 +0100 +@@ -63,21 +63,19 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): config prebuild modules postbuild + + config: +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) \ ++ $(CPP) $(OBJ_C) $(OBJ_CPP) \ + -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) +--- endeavour-3.1.4/endeavour2/format.front/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/format.front/Makefile 2014-02-07 16:12:08.927191946 +0100 +@@ -63,21 +63,19 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): config prebuild modules postbuild + + config: +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ ++ $(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ + -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) +--- endeavour-3.1.4/endeavour2/fsck.front/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/fsck.front/Makefile 2014-02-07 16:12:48.077190303 +0100 +@@ -63,21 +63,19 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): config prebuild modules postbuild + + config: +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ ++ $(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ + -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) +--- endeavour-3.1.4/endeavour2/hedit/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/hedit/Makefile 2014-02-07 16:13:18.860522345 +0100 +@@ -63,21 +63,19 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): config prebuild modules postbuild + + config: +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ ++ $(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ + -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) +--- endeavour-3.1.4/endeavour2/sysinfo/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/sysinfo/Makefile 2014-02-07 16:13:42.900521336 +0100 +@@ -62,21 +62,19 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): config prebuild modules postbuild + + config: +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) \ ++ $(CPP) $(OBJ_C) $(OBJ_CPP) \ + -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) +--- endeavour-3.1.4/endeavour2/tedit/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/tedit/Makefile 2014-02-07 16:14:10.183853524 +0100 +@@ -64,21 +64,19 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): config prebuild modules postbuild + + config: +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ ++ $(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ + -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) +--- endeavour-3.1.4/endeavour2/ziptool.front/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/ziptool.front/Makefile 2014-02-07 16:15:36.167183249 +0100 +@@ -63,21 +63,19 @@ + OBJ_C = $(SRC_C:.c=.o) + OBJ_CPP = $(SRC_CPP:.cpp=.o) + .c.o: +- @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) ++ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) + .cpp.o: +- @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) ++ $(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) + + + $(BIN): config prebuild modules postbuild + + config: +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + modules: $(OBJ_C) $(OBJ_CPP) + @echo -n "Linking modules..." +- @$(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ ++ $(CPP) $(OBJ_C) $(OBJ_CPP) $(OBJ_SO) \ + -o $(BIN) $(LIB_DIRS) $(LIBS) + @echo -n " " + @-$(LS) $(LSFLAGS) $(BIN) +--- endeavour-3.1.4/endeavour2/utils/Makefile.orig 2009-09-12 09:00:00.000000000 +0200 ++++ endeavour-3.1.4/endeavour2/utils/Makefile 2014-02-07 16:17:13.900512481 +0100 +@@ -104,113 +104,97 @@ + + config: + @echo "Compiling resources" +- @$(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h ++ $(EXPORT_COMPILETIMEINFO_H) > compiletimeinfo.h + + directory-statistics: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + dnd-drag-maker: +- @echo "Compiling $(@)" +- @$(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c +- @$(CPP) $(LIBS_GTK) $(@).o \ ++ $(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c ++ $(CPP) $(LIBS_GTK) $(@).o \ + ../guiutils.o \ + ../hview.o ../hviewcb.o \ + -o $(@) + + dnd-drop-reader: +- @echo "Compiling $(@)" +- @$(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c +- @$(CPP) $(LIBS_GTK) $(@).o \ ++ $(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c ++ $(CPP) $(LIBS_GTK) $(@).o \ + ../guiutils.o \ + ../hview.o ../hviewcb.o \ + -o $(@) + + file-selector: +- @echo "Compiling $(@)" +- @$(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c +- @$(CPP) $(LIBS_GTK) $(@).o \ ++ $(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c ++ $(CPP) $(LIBS_GTK) $(@).o \ + ../fb.o \ + ../cdialog.o ../guiutils.o ../fprompt.o ../pulist.o \ + ../string.o ../disk.o ../fio.o \ + -o $(@) + + memory-usage-estimator: +- @echo "Compiling $(@)" +- @$(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c +- @$(CPP) $(LIBS_GTK) $(@).o \ ++ $(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c ++ $(CPP) $(LIBS_GTK) $(@).o \ + ../guiutils.o \ + -o $(@) + + message-dialog: +- @echo "Compiling $(@)" +- @$(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c +- @$(CPP) $(LIBS_GTK) $(@).o \ ++ $(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c ++ $(CPP) $(LIBS_GTK) $(@).o \ + ../guiutils.o ../cdialog.o ../string.o \ + -o $(@) + + mls: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + notify: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + open: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + properties: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + purge: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + recover: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + recycle: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + rls: +- @echo "Compiling $(@)" +- @$(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ ++ $(CC) $(CFLAGS) $(CFLAGS_EDV2) $(LIBS_EDV2) \ + $(@).c \ + -o $(@) + + splash: +- @echo "Compiling $(@)" +- @$(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c +- @$(CPP) $(LIBS_GTK) $(@).o \ ++ $(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c ++ $(CPP) $(LIBS_GTK) $(@).o \ + ../guiutils.o ../guirgbimg.o \ + ../splash.o \ + -o $(@) + + style-editor: +- @echo "Compiling $(@)" +- @$(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c +- @$(CPP) $(LIBS_GTK) $(@).o \ ++ $(CC) -c $(CFLAGS) $(CFLAGS_GTK) $(@).c ++ $(CPP) $(LIBS_GTK) $(@).o \ + ../guiutils.o ../cdialog.o ../fprompt.o ../pulist.o \ + ../fb.o ../csd.o ../fsd.o ../style_edit.o \ + ../string.o ../fio.o ../disk.o \ diff --git a/endeavour.spec b/endeavour.spec index a256918..3626087 100644 --- a/endeavour.spec +++ b/endeavour.spec @@ -1,58 +1,84 @@ # # Conditional build: -%bcond_with polish # build with Polish translation +%bcond_with gtk2 # GTK+ 2.x port (incomplete) +%bcond_with polish # build with Polish translation [outdated patch] # -%define pname endeavour2 - -Summary: endeavour2 file browser -Summary(pl.UTF-8): endeavour2 - przeglądarka plików +Summary: Endeavour Mark II file management suite +Summary(pl.UTF-8): Oprogramowanie do zarządzania plikami Endeavour Mark II Name: endeavour -Version: 2.7.4 +Version: 3.1.4 Release: 1 -License: GPL +License: GPL v2 Group: X11/Applications -Source0: http://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tgz -# Source0-md5: 19bef38c8e70f1eab652ebc1fbabdf5c +Source0: http://wolfsinger.com/~wolfpack/packages/%{name}-%{version}.tar.bz2 +# Source0-md5: 1952cf9ef05b75abe48b45cb4068427f Source1: http://abram.eu.org/EndeavourII/%{name}-icons.tgz # Source1-md5: d527e5211cc2858ccdc6de72cc3f3ff7 Source2: %{name}-mimetypes.ini Patch0: %{name}-PLD.patch -Patch1: %{name}-PLD-polish.patch -URL: http://wolfpack.twu.net/Endeavour2/ -BuildRequires: gtk+-devel >= 1.2 -#BuildRequires: gtk+2-devel >= 2.0 +Patch1: %{name}-fixes.patch +Patch2: %{name}-giflib.patch +Patch3: %{name}-verbose.patch +Patch4: %{name}-libmng.patch +Patch5: %{name}-libpng.patch +Patch6: %{name}-PLD-polish.patch +URL: http://freecode.com/projects/endeavour2 +BuildRequires: bzip2-devel +BuildRequires: giflib-devel +BuildRequires: glib-devel >= 1.2 +%{!?with_gtk2:BuildRequires: gtk+-devel >= 1.2} +%{?with_gtk2:BuildRequires: gtk+2-devel >= 2.0} BuildRequires: imlib-devel -#BuildRequires: pkgconfig +BuildRequires: libid3tag-devel +BuildRequires: libjpeg-devel +BuildRequires: libmng-devel +BuildRequires: libpng-devel +BuildRequires: libstdc++-devel +BuildRequires: libtar-devel +BuildRequires: libtiff-devel +BuildRequires: libzip-devel +%{?with_gtk2:BuildRequires: pkgconfig} +BuildRequires: xar-devel +BuildRequires: xorg-lib-libXpm-devel +BuildRequires: xorg-lib-libXxf86vm-devel +BuildRequires: zlib-devel +Requires: %{name}-libs = %{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _confdir /etc/%{pname} -%define _libdirend %{_libdir}/%{pname} -%define _icons %{_datadir}/%{pname}/icons -%define _help %{_datadir}/%{pname}/help +%define pname endeavour2 +%define pkgconfdir /etc/%{pname} +%define pkglibdir %{_libdir}/%{pname} +%define pkgdatadir %{_libdir}/%{pname} %description -endeavour file browser. +Endeavour Mark II is a complete file management suite that comes with +a file browser, image browser, archiver, recycled objects system, and +a set of file and disk management utility programs. %description -l pl.UTF-8 -endeavour - przeglądarka plików. +Endeavour Mark II to kompletne oprogramowanie do zarządzania plikami, +zawierające przeglądarkę plików, przeglądarkę obrazów, archiwizer, +system recyklingu oraz zbiór programów narzędziowych do zarządzania +plikami i dyskami. %package libs -Summary: Endeavour2 library -Summary(pl.UTF-8): Bibloteka Endeavour2 -Group: X11/Applications +Summary: Endeavour2 base library +Summary(pl.UTF-8): Bibloteka podstawowa Endeavour2 +Group: Libraries %description libs -Endeavour2 library. +Endeavour2 base library. %description libs -l pl.UTF-8 -Biblioteka Endeavour2. +Biblioteka podstawowa Endeavour2. %package devel Summary: Header files for endeavour2 Summary(pl.UTF-8): Pliki nagłówkowe endeavour2 Group: Development/Libraries -Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release} +Requires: glib-devel >= 1.2 +Requires: libstdc++-devel %description devel Endeavour2 header files. @@ -63,46 +89,66 @@ Pliki nagłówkowe Endeavour2. %prep %setup -q -a1 %patch0 -p1 -%if %{with polish} %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%if %{with polish} +%patch6 -p1 %endif %build ./configure \ - PLD + Linux %{__make} \ CC="%{__cc}" \ CPP="%{__cxx}" \ OPTCFLAGS="%{rpmcflags} -fPIC" \ - EDV_LIB_DIR=%{_libdir} \ - LIB_DIRS= + EDV_LIB_DIR=%{_libdir} +# LIB_DIRS= %install rm -rf $RPM_BUILD_ROOT -install -d \ - $RPM_BUILD_ROOT{%{_confdir},%{_libdirend},%{_bindir}} \ - $RPM_BUILD_ROOT{%{_icons},%{_mandir}/man1,%{_help}} \ - $RPM_BUILD_ROOT%{_includedir}/%{pname} - -# add xpm icons for OO type -install icons/{ooo_calc.xpm,ooo_impress.xpm,ooo_writer.xpm,sdc.xpm,sdw.xpm} $RPM_BUILD_ROOT%{_icons} -# instalation from package is ugly so I decide to put files by my self -cd endeavour2 -install %{pname} $RPM_BUILD_ROOT%{_bindir} -install download.front/download.front $RPM_BUILD_ROOT%{_libdirend} -install fsck.front/fsck.front $RPM_BUILD_ROOT%{_libdirend} -install format.front/format.front $RPM_BUILD_ROOT%{_libdirend} -install images/* $RPM_BUILD_ROOT%{_icons} -install data/help/* $RPM_BUILD_ROOT%{_help} -bzip2 -dc endeavour2.1.bz2 > $RPM_BUILD_ROOT%{_mandir}/man1/endeavour2.1 -# devel -install lib/*.h $RPM_BUILD_ROOT%{_includedir}/%{pname} -install lib/libendeavour2.so $RPM_BUILD_ROOT%{_libdir} -install lib/endeavour2-config $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{pkgconfdir} + +#install -d \ +# $RPM_BUILD_ROOT{%{pkgconfdir},%{pkglibdir},%{pkgdatadir}/{help,icons}} \ +# $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_includedir}/%{pname}} + +%{__make} install \ + PREFIX=$RPM_BUILD_ROOT%{_prefix} \ + EDV_ARCHDEP_DIR=$RPM_BUILD_ROOT%{pkglibdir} \ + EDV_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \ + MAN_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ + MAN1_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \ + MAN3_DIR=$RPM_BUILD_ROOT%{_mandir}/man3 \ + ICONS_DIR=$RPM_BUILD_ROOT%{_pixmapsdir} \ + INSTBINFLAGS="-m755" \ + INSTLIBFLAGS="-m755" \ + LDCONFIG=: + +## add xpm icons for OO type +#install icons/{ooo_calc.xpm,ooo_impress.xpm,ooo_writer.xpm,sdc.xpm,sdw.xpm} $RPM_BUILD_ROOT%{pkgdatadir}/icons +## instalation from package is ugly so I decide to put files by my self +#cd endeavour2 +#install %{pname} $RPM_BUILD_ROOT%{_bindir} +#install download.front/download.front $RPM_BUILD_ROOT%{pkglibdir} +#install fsck.front/fsck.front $RPM_BUILD_ROOT%{pkglibdir} +#install format.front/format.front $RPM_BUILD_ROOT%{pkglibdir} +#install images/* $RPM_BUILD_ROOT%{pkgdatadir}/icons +#install data/help/* $RPM_BUILD_ROOT%{pkgdatadir}/help +#bzip2 -dc endeavour2.1.bz2 > $RPM_BUILD_ROOT%{_mandir}/man1/endeavour2.1 +## devel +#install lib/*.h $RPM_BUILD_ROOT%{_includedir}/%{pname} +#install lib/libendeavour2.so $RPM_BUILD_ROOT%{_libdir} +#install lib/endeavour2-config $RPM_BUILD_ROOT%{_bindir} + +bzip2 -d $RPM_BUILD_ROOT%{_mandir}/man1/*.bz2 # mime types by abram@ -install %{SOURCE2} $RPM_BUILD_ROOT%{_confdir}/mimetypes.ini +install %{SOURCE2} $RPM_BUILD_ROOT%{pkgconfdir}/mimetypes.ini %clean rm -rf $RPM_BUILD_ROOT @@ -113,20 +159,26 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS HACKING TODO LANGUAGE README -%attr(755,root,root) %{_bindir}/%{pname} -%attr(755,root,root) %{_libdirend} -%{_mandir}/man1/* -%dir %{_datadir}/%{pname} -%{_icons} -%{_help} -%{_confdir} +%attr(755,root,root) %{_bindir}/endeavour2 +%dir %{pkglibdir} +%dir %{pkglibdir}/bin +%attr(755,root,root) %{pkglibdir}/bin/* +%{_datadir}/%{pname} +%dir %{pkgconfdir} +%config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/mimetypes.ini +%{_pixmapsdir}/endeavour2*.xpm +%{_mandir}/man1/endeavour2.1* +%{_mandir}/man1/hedit.1* +%{_mandir}/man1/sysinfo.endeavour2.1* +%{_mandir}/man1/tedit.1* %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libendeavour2.so +%attr(755,root,root) %{_libdir}/libendeavour2-base.so %files devel %defattr(644,root,root,755) -%doc endeavour2/lib/INTERPS -%attr(755,root,root) %{_bindir}/endeavour2-config +%doc endeavour2/libendeavour2-base/INTERPS +%attr(755,root,root) %{_bindir}/endeavour2-base-config %{_includedir}/%{pname} +%{_mandir}/man1/endeavour2-base-config.1* -- 2.44.0