Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=3385b3709e59af282f74b71e46677324889bd269
commit 3385b3709e59af282f74b71e46677324889bd269 Author: Baste <[email protected]> Date: Tue Jul 3 14:24:52 2012 +0200 efltk-2.0.8-2-x86_64 * bin , eFLTK is deprecated diff --git a/source/xlib-extra/efltk/01-fix-cflags.patch b/source/xlib-extra/efltk/01-fix-cflags.patch deleted file mode 100644 index ff5a21c..0000000 --- a/source/xlib-extra/efltk/01-fix-cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur efltk/makeinclude.in efltk-p/makeinclude.in ---- efltk/makeinclude.in 2006-09-02 22:55:56.000000000 +0200 -+++ efltk-p/makeinclude.in 2006-09-03 13:20:03.735015208 +0200 -@@ -55,8 +55,8 @@ - # flags for compiler: - # WALL = -Wcomment -Wformat -Wimplicit-int -Werror-implicit-function-declaration -Wmain -Wmultichar -Wparentheses -Wreturn-type -Wswitch -Wunused - WALL = -Wall --CFLAGS = -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) $(WALL) @CFLAGS@ @DEBUGFLAG@ --CXXFLAGS = -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) $(WALL) @CXXFLAGS@ @DEBUGFLAG@ -+CFLAGS += -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) @CFLAGS@ -+CXXFLAGS += -DHAVE_CONFIG_H -I$(EFLTK_BUILDDIR) @CXXFLAGS@ - - # static libs: - LIBEXT =@LIBEXT@ diff --git a/source/xlib-extra/efltk/FrugalBuild b/source/xlib-extra/efltk/FrugalBuild deleted file mode 100644 index aa14f6b..0000000 --- a/source/xlib-extra/efltk/FrugalBuild +++ /dev/null @@ -1,40 +0,0 @@ -# Compiling Time: 0.59 SBU -# Maintainer: crazy <[email protected]> -# Contributor: BMH1980 <[email protected]> - -pkgname=efltk -pkgver=2.0.8 -pkgrel=2 -pkgdesc="EFltk is a LGPL'd C++ graphical user interface toolkit" -_F_sourceforge_dirname="ede" -Finclude sourceforge -url="http://equinox-project.org/"; -source=($source 01-fix-cflags.patch $pkgname-scandirfix.patch \ -$pkgname-odbc.patch) -depends=('libjpeg>=8b' 'libstdc++' 'libpng>=1.4.2' 'mesa' 'libxrender' 'freetype2>=2.3.1' \ -'fontconfig' 'unixodbc' 'libxft') -groups=('xlib-extra') -archs=('i686' 'x86_64') -sha1sums=('e6c9838fb01628616e1ec854dc25ac8f151f5725' \ - '0c8f452f9b3234f8e1694b149bc649ee01569f5b' \ - 'fe7ad86b382bb0745305bf2feda506fee1a68b7a' \ - '5d527642a82db8f249f7af1fcc880b6d5f9a3cfa') - -build() -{ - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" - Fcd $pkgname - Fpatchall - rm configure - autoconf || Fdie - Fmkdir /usr/{bin,include,lib} - Fconf \ - --enable-opengl --enable-utf8 \ - --enable-xft --enable-plugins \ - --enable-xdbe --disable-debug \ - --disable-mysql - make || return 1 - Fmakeinstall -} - -# optimization OK diff --git a/source/xlib-extra/efltk/efltk-odbc.patch b/source/xlib-extra/efltk/efltk-odbc.patch deleted file mode 100644 index f3ebab5..0000000 --- a/source/xlib-extra/efltk/efltk-odbc.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur efltk//src/db/odbc/Fl_ODBC_Database.cpp efltk-2//src/db/odbc/Fl_ODBC_Database.cpp ---- efltk//src/db/odbc/Fl_ODBC_Database.cpp 2009-04-22 13:51:33.000000000 +0200 -+++ efltk-2//src/db/odbc/Fl_ODBC_Database.cpp 2010-05-31 11:48:01.483437976 +0200 -@@ -266,9 +266,9 @@ - - void Fl_ODBC_Database::bind_parameters(Fl_Query *query) { - int rc; -- SQLINTEGER cbNullData = SQL_NULL_DATA; -- SQLINTEGER cbNTS = SQL_NTS; -- SQLINTEGER *pcbLen; -+ SQLLEN cbNullData = SQL_NULL_DATA; -+ SQLLEN cbNTS = SQL_NTS; -+ SQLLEN *pcbLen; - - SQLHSTMT statement = (SQLHSTMT)query_handle(query); - Fl_Params& params = query->params(); -@@ -389,7 +389,7 @@ - * Get the column information - */ - void Fl_ODBC_Database::query_col_attributes(Fl_Query *query,short column,short descType,long& value) { -- int m_retcode = SQLColAttributes(query_handle(query),column,descType,0,0,0,(SQLINTEGER *)&value); -+ int m_retcode = SQLColAttributes(query_handle(query),column,descType,0,0,0,(SQLLEN *)&value); - - if (!successful(m_retcode)) - fl_throw(query_error(query)); -@@ -568,7 +568,7 @@ - - Fl_Data_Fields& fields = query_fields(query); - unsigned fieldCount = fields.count(); -- SQLINTEGER dataLength; -+ SQLLEN dataLength; - - if (!fieldCount) return; - diff --git a/source/xlib-extra/efltk/efltk-scandirfix.patch b/source/xlib-extra/efltk/efltk-scandirfix.patch deleted file mode 100644 index dec3039..0000000 --- a/source/xlib-extra/efltk/efltk-scandirfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- efltk/src/core/filename_list.cpp 2009-04-22 12:51:38.000000000 +0000 -+++ efltk/src/core/filename_list.cpp 2010-05-21 23:48:01.000000000 +0000 -@@ -59,7 +59,7 @@ int fl_filename_list(const char *dir, di - // The vast majority of Unix systems want the sort function to have this - // prototype, most likely so that it can be passed to qsort without any - // changes: -- return scandir(dir, list, 0, (int(*)(const void*,const void*))sort); -+ return scandir(dir, list, 0, (int(*)(const dirent **,const dirent **))sort); - #else - // This version is when we define our own scandir (WIN32 and perhaps - // some Unix systems) and apparently on Irix: _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
