Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8e7d9b46030474da589efb30da5a103a1ce9d567
commit 8e7d9b46030474da589efb30da5a103a1ce9d567 Author: crazy <[EMAIL PROTECTED]> Date: Sun May 18 01:00:24 2008 +0200 flu-2.14-2-x86_64 * added x86_64 to archs * added patch to fix the build * added missing Fdie's diff --git a/source/xlib-extra/flu/FrugalBuild b/source/xlib-extra/flu/FrugalBuild index abd00f9..f1225a9 100644 --- a/source/xlib-extra/flu/FrugalBuild +++ b/source/xlib-extra/flu/FrugalBuild @@ -8,12 +8,13 @@ pkgdesc="FLTK Utility widgets." url="http://www.osc.edu/~jbryan/FLU/"; depends=('fltk' 'mesa') groups=('xlib-extra') -archs=('i686') +archs=('i686' 'x86_64') up2date="lynx -dump $url | grep -m1 version | sed 's/.*n \(.*\):.*/\1/'" -source=($url/FLU_$pkgver.tar.gz flu-$pkgver-gcc4.patch) +source=($url/FLU_$pkgver.tar.gz flu-$pkgver-gcc4.patch int_vs_long-x86_64.patch) _F_cd_path="FLU_$pkgver" -sha1sums=('8ac72867d44513d4c27f0cab3e635a1ff13d4d82'\ - 'd1096bedff6624be30e9d4725d7741cc78392a3a') +sha1sums=('8ac72867d44513d4c27f0cab3e635a1ff13d4d82' \ + 'd1096bedff6624be30e9d4725d7741cc78392a3a' \ + '1d84d8c31ab3ed8fdd161f069eb4db97d19f66d2') build() { @@ -23,12 +24,12 @@ build() Fmkdir /usr/{bin,lib} Fexerel flu-config /usr/bin/ - cd src - cp lib* $Fdestdir/usr/lib/ + cd src || Fdie + cp lib* $Fdestdir/usr/lib/ || Fdie Ffileschmod /usr/lib 755 # Install headers - cd .. + cd .. || Fdie Fmkdir /usr/include/FLU Ffilerel FLU/*.h /usr/include/FLU/ } diff --git a/source/xlib-extra/flu/int_vs_long-x86_64.patch b/source/xlib-extra/flu/int_vs_long-x86_64.patch new file mode 100644 index 0000000..e7097cc --- /dev/null +++ b/source/xlib-extra/flu/int_vs_long-x86_64.patch @@ -0,0 +1,36 @@ +diff -Naur FLU_2.14/FLU/Flu_Tree_Browser.h FLU_2.14-p/FLU/Flu_Tree_Browser.h +--- FLU_2.14/FLU/Flu_Tree_Browser.h 2004-11-05 18:03:20.000000000 +0100 ++++ FLU_2.14-p/FLU/Flu_Tree_Browser.h 2008-05-18 00:55:42.000000000 +0200 +@@ -1078,7 +1078,7 @@ + //! Remove the entry identified by path \b fullpath from this node + /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */ + inline unsigned int remove( const char *fullpath ) +- { return( (unsigned int)modify( fullpath, REMOVE, tree->rdata ) ); } ++ { return( (unsigned long)modify( fullpath, REMOVE, tree->rdata ) ); } + + //! Remove the entry identified by unique id \b id from this node + /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */ +diff -Naur FLU_2.14/src/Flu_File_Chooser.cpp FLU_2.14-p/src/Flu_File_Chooser.cpp +--- FLU_2.14/src/Flu_File_Chooser.cpp 2004-11-02 01:33:31.000000000 +0100 ++++ FLU_2.14-p/src/Flu_File_Chooser.cpp 2008-05-18 00:55:42.000000000 +0200 +@@ -2773,7 +2773,7 @@ + const Fl_Menu_Item *selection = entryPopup.popup(); + if( selection ) + { +- int handler = (int)selection->user_data(); ++ int handler = (long)selection->user_data(); + switch( handler ) + { + case ACTION_NEW_FOLDER: +diff -Naur FLU_2.14/src/Flu_Tree_Browser.cpp FLU_2.14-p/src/Flu_Tree_Browser.cpp +--- FLU_2.14/src/Flu_Tree_Browser.cpp 2004-11-05 18:03:20.000000000 +0100 ++++ FLU_2.14-p/src/Flu_Tree_Browser.cpp 2008-05-18 00:55:28.000000000 +0200 +@@ -2983,7 +2983,7 @@ + + unsigned int Flu_Tree_Browser :: remove( const char *fullpath ) + { +- return( (unsigned int)root.modify( fullpath, Node::REMOVE, rdata ) ); ++ return( (unsigned long)root.modify( fullpath, Node::REMOVE, rdata ) ); + } + + unsigned int Flu_Tree_Browser :: remove( const char *path, const char *text ) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
