diff options
Diffstat (limited to 'x11-libs/fltk/files')
| -rw-r--r-- | x11-libs/fltk/files/FLTKConfig.cmake | 37 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch | 55 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.2-desktop.patch | 19 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 22 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch | 10 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch | 165 | ||||
| -rw-r--r-- | x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch | 33 |
7 files changed, 0 insertions, 341 deletions
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake deleted file mode 100644 index 09427aac2aa5..000000000000 --- a/x11-libs/fltk/files/FLTKConfig.cmake +++ /dev/null @@ -1,37 +0,0 @@ -#----------------------------------------------------------------------------- -# -# FLTKConfig.cmake - FLTK CMake configuration file for external projects. -# -# This file is configured by FLTK and used by the UseFLTK.cmake module -# to load FLTK's settings for an external project. - -# The FLTK source tree. -# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@") - -# The FLTK include file directories. -SET(FLUID_COMMAND "/usr/bin/fluid") -SET(FLTK_EXECUTABLE_DIRS "/usr/bin") -SET(FLTK_LIBRARY_DIRS "/usr/lib") -SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk") -SET(FLTK_INCLUDE_DIRS "/usr/include") - -# The C and C++ flags added by FLTK to the cmake-configured flags. -SET(FLTK_REQUIRED_C_FLAGS "") -SET(FLTK_REQUIRED_CXX_FLAGS "") - -# The FLTK version number -SET(FLTK_VERSION_MAJOR "1") -SET(FLTK_VERSION_MINOR "1") -SET(FLTK_VERSION_PATCH "7") - -# Is FLTK using shared libraries? -SET(FLTK_BUILD_SHARED_LIBS "ON") -# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@") - -# The location of the UseFLTK.cmake file. -SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake") - -# # The ExodusII library dependencies. -# IF(NOT FLTK_NO_LIBRARY_DEPENDS) -# INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@") -# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS) diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch deleted file mode 100644 index 74022a72ffb9..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -100,9 +103,6 @@ - touch config.h - chmod +x fltk-config - --configure: configure.in -- autoconf -- - config.guess config.sub: - -automake --add-missing 2> /dev/null - if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -84,11 +84,6 @@ - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ - fi - echo "Installing man pages in $(DESTDIR)$(mandir) ..." -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 -@@ -96,10 +91,6 @@ - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - - install-linux install-osx: -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 -@@ -108,17 +99,11 @@ - - uninstall: - $(RMDIR) $(DESTDIR)$(docdir) -- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 -- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 -- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) - $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 - - uninstall-linux uninstall-osx: -- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 - $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 - $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch deleted file mode 100644 index ef72ba9c3ec2..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/fluid/fluid.desktop -+++ b/fluid/fluid.desktop -@@ -6,5 +6,5 @@ - Icon=fluid - Terminal=false - Type=Application --MimeType=application/x-fluid -+MimeType=application/x-fluid; - Categories=Development;GUIDesigner; ---- a/fluid/x-fluid.desktop -+++ b/fluid/x-fluid.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Type=MimeType --MimeType=application/x-fluid -+MimeType=application/x-fluid; - Icon=fluid.png - Patterns=*.fl - Name=FLUID diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch deleted file mode 100644 index ed487e7dc24d..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/479774 - ---- a/src/Fl_JPEG_Image.cxx -+++ b/src/Fl_JPEG_Image.cxx -@@ -155,7 +155,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_stdio_src(&dinfo, fp); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; -@@ -337,7 +337,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_mem_src(&dinfo, data); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch deleted file mode 100644 index 562f1157038f..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Fl_x.cxx -+++ b/src/Fl_x.cxx -@@ -2211,6 +2211,7 @@ - static int result = -1; - - if (result == -1) { -+ fl_open_display(); - result = 0; - unsigned long nitems; - unsigned long *words = 0; diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch deleted file mode 100644 index f30105e18c06..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- a/src/xutf8/utf8Input.c -+++ b/src/xutf8/utf8Input.c -@@ -18,6 +18,7 @@ - - #include <config.h> - #include "../Xutf8.h" -+#include "../../FL/Fl_Export.H" - #include <X11/X.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> -@@ -53,7 +54,7 @@ typedef struct { - #include "lcUniConv/jisx0212.h" - #include "lcUniConv/ksc5601.h" - --static int -+FL_EXPORT static int - XConvertEucTwToUtf8(char* buffer_return, int len) { - /* FIXME */ - #if HAVE_LIBC_ICONV -@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertEucKrToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertBig5ToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertCp936extToUtf8(char* buffer_return, int len) - { - int i = 0, l = 0; -@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu - return l; - } - --static int -+FL_EXPORT static int - XConvertGb2312ToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return - return l; - } - --static int -+FL_EXPORT static int - XConvertEucCnToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertEucJpToUtf8(char* buffer_return, int len) { - int i = 0, l = 0; - char *buf; -@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return, - return l; - } - --static int -+FL_EXPORT static int - XConvertEucToUtf8(const char* locale, - char* buffer_return, - int len, -@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char* locale, - return len; - } - --int -+FL_EXPORT int - XUtf8LookupString(XIC ic, - XKeyPressedEvent* event, - char* buffer_return, ---- a/src/xutf8/utf8Utils.c -+++ b/src/xutf8/utf8Utils.c -@@ -21,6 +21,7 @@ - #if !defined(WIN32) && !defined(__APPLE__) - - #include "../Xutf8.h" -+#include "../../FL/Fl_Export.H" - - /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/ - -@@ -29,7 +30,7 @@ - * Returns the byte length of the converted UTF-8 char - * Returns -1 if the UTF-8 string is not valid - */ --int -+FL_EXPORT int - XConvertUtf8ToUcs(const unsigned char *buf, - int len, - unsigned int *ucs) { -@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int ucs, - * returns the byte length of the first UTF-8 char - * (returns -1 if not valid) - */ --int -+FL_EXPORT int - XUtf8CharByteLen(const unsigned char *buf, - int len) { - unsigned int ucs; -@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char *buf - /* - * Same as XConvertUtf8ToUcs but no sanity check is done. - */ --int -+FL_EXPORT int - XFastConvertUtf8ToUcs(const unsigned char *buf, - int len, - unsigned int *ucs) { ---- a/src/xutf8/utf8Wrap.c -+++ b/src/xutf8/utf8Wrap.c -@@ -20,6 +20,7 @@ - #if !defined(WIN32) && !defined(__APPLE__) - - #include "../Xutf8.h" -+#include "../../FL/Fl_Export.H" - #include <X11/Xlib.h> - #include <ctype.h> - #include <stdlib.h> -@@ -705,7 +706,7 @@ XUtf8_measure_extents( - /*****************************************************************************/ - /** returns the pixel width of a UTF-8 string **/ - /*****************************************************************************/ --int -+FL_EXPORT int - XUtf8TextWidth(XUtf8FontStruct *font_set, - const char *string, - int num_bytes) { -@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct *font_se - /*****************************************************************************/ - /** get the X font and glyph ID of a UCS char **/ - /*****************************************************************************/ --int -+FL_EXPORT int - XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set, - unsigned int ucs, - XFontStruct **fnt, -@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *f - /*****************************************************************************/ - /** returns the pixel width of a UCS char **/ - /*****************************************************************************/ --int -+FL_EXPORT int - XUtf8UcsWidth(XUtf8FontStruct *font_set, - unsigned int ucs) { - diff --git a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch b/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch deleted file mode 100644 index 32dcd3016349..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.4-freetype_pkgconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1005,13 +1005,13 @@ - AC_ARG_ENABLE(xft, [ --enable-xft turn on Xft support [[default=yes]]]) - - xft_found=no -- if test x$enable_xft != xno; then -- AC_PATH_PROG(FTCONFIG, freetype-config) -- -- if test "x$FTCONFIG" != x; then -- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" -- CFLAGS="`$FTCONFIG --cflags` $CFLAGS" -- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" -+ AS_IF([test x$enable_xft != xno], [ -+ PKG_PROG_PKG_CONFIG -+ PKG_CHECK_MODULES(FREETYPE, freetype2, [ -+ CPPFLAGS="$FREETYPE_CFLAGS $CPPFLAGS" -+ CFLAGS="$FREETYPE_CFLAGS $CFLAGS" -+ CXXFLAGS="$FREETYPE_CFLAGS $CXXFLAGS" -+ ],AC_MSG_ERROR([No freetype found])) - - AC_CHECK_LIB(fontconfig, FcPatternCreate) - AC_CHECK_HEADER(X11/Xft/Xft.h, -@@ -1019,8 +1019,7 @@ - [AC_DEFINE(USE_XFT) - LIBS="-lXft $LIBS" - xft_found=yes] )) -- fi -- fi -+ ]) - - dnl Issue a warning message if Xft was not found, abort configure - dnl if Xft was requested explicitly (but not found) |