diff options
| -rw-r--r-- | system/FreeFileSync/FreeFileSync.SlackBuild | 10 | ||||
| -rw-r--r-- | system/FreeFileSync/FreeFileSync.info | 6 | ||||
| -rw-r--r-- | system/FreeFileSync/use_our_cflags-5.6.patch | 11 | ||||
| -rw-r--r-- | system/FreeFileSync/use_our_cflags.patch | 14 |
4 files changed, 19 insertions, 22 deletions
diff --git a/system/FreeFileSync/FreeFileSync.SlackBuild b/system/FreeFileSync/FreeFileSync.SlackBuild index 26d17a1502..be7bfe0b8e 100644 --- a/system/FreeFileSync/FreeFileSync.SlackBuild +++ b/system/FreeFileSync/FreeFileSync.SlackBuild @@ -28,7 +28,7 @@ # SUCH DAMAGE. PRGNAM=FreeFileSync -VERSION=${VERSION:-3.16} +VERSION=${VERSION:-5.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,7 +67,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION mkdir -p $PRGNAM-$VERSION cd $PRGNAM-$VERSION -unzip $CWD/${PRGNAM}_Sourcecode_v${VERSION}.zip +unzip $CWD/${PRGNAM}_${VERSION}_source.zip chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -76,7 +76,7 @@ find . \ -exec chmod 644 {} \; # Let's use our SLKCFLAGS -patch -p1 < $CWD/use_our_cflags.patch +patch -p1 < $CWD/use_our_cflags-5.6.patch make OPTS="$SLKCFLAGS" make install DESTDIR=$PKG @@ -90,10 +90,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/share/applications cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop mkdir -p $PKG/usr/share/pixmaps -cat $PKG/usr/share/$PRGNAM/Help/html/ffsicon.png > $PKG/usr/share/pixmaps/$PRGNAM.png +cat ./BUILD/Help/img/ffsicon.png > $PKG/usr/share/pixmaps/$PRGNAM.png mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE BUILD/Changelog.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Compile.txt BUILD/License.txt BUILD/Changelog.txt *.ods $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/FreeFileSync/FreeFileSync.info b/system/FreeFileSync/FreeFileSync.info index 11ee47cc41..631e9ab3ee 100644 --- a/system/FreeFileSync/FreeFileSync.info +++ b/system/FreeFileSync/FreeFileSync.info @@ -1,8 +1,8 @@ PRGNAM="FreeFileSync" -VERSION="3.16" +VERSION="5.6" HOMEPAGE="http://freefilesync.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/freefilesync/FreeFileSync_Sourcecode_v3.16.zip" -MD5SUM="7672414fffa05e44a5bc206e9b694753" +DOWNLOAD="http://downloads.sourceforge.net/freefilesync/FreeFileSync_5.6_source.zip" +MD5SUM="8fa79c7a74d2d7323d4977ac7e0a6e9f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkmm wxPython" diff --git a/system/FreeFileSync/use_our_cflags-5.6.patch b/system/FreeFileSync/use_our_cflags-5.6.patch new file mode 100644 index 0000000000..740c0fb2ed --- /dev/null +++ b/system/FreeFileSync/use_our_cflags-5.6.patch @@ -0,0 +1,11 @@ +--- FreeFileSync-5.6/Makefile.orig 2012-08-06 10:04:22.606837678 +0200 ++++ FreeFileSync-5.6/Makefile 2012-08-06 10:06:56.758716307 +0200 +@@ -5,7 +5,7 @@ + APPSHAREDIR = $(SHAREDIR)/$(APPNAME) + DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME) + +-COMMON_COMPILE_FLAGS = -Wall -pipe -O3 -pthread -std=gnu++0x -DNDEBUG -DwxUSE_UNICODE -DFFS_LINUX -DZEN_PLATFORM_OTHER -DWXINTL_NO_GETTEXT_MACRO -I. -include "zen/i18n.h" ++COMMON_COMPILE_FLAGS = -Wall -pipe $(OPTS) -pthread -std=gnu++0x -DNDEBUG -DwxUSE_UNICODE -DFFS_LINUX -DZEN_PLATFORM_OTHER -DWXINTL_NO_GETTEXT_MACRO -I. -include "zen/i18n.h" + COMMON_LINK_FLAGS = -pthread -lrt -lz + + #default build diff --git a/system/FreeFileSync/use_our_cflags.patch b/system/FreeFileSync/use_our_cflags.patch deleted file mode 100644 index f9de7ee903..0000000000 --- a/system/FreeFileSync/use_our_cflags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur orig/Makefile new/Makefile ---- orig/Makefile 2011-04-19 14:46:30.000000000 -0500 -+++ new/Makefile 2011-06-20 12:12:45.252826394 -0500 -@@ -4,8 +4,8 @@ - SHAREDIR = $(DESTDIR)$(prefix)/share - APPSHAREDIR = $(SHAREDIR)/$(APPNAME) - --COMMON_COMPILE_FLAGS = -Wall -pipe `pkg-config --cflags gtk+-2.0` -O3 -pthread -DNDEBUG -DwxUSE_UNICODE -DFFS_LINUX -DTIXML_USE_STL -DWXINTL_NO_GETTEXT_MACRO --COMMON_LINK_FLAGS = -O3 -pthread -+COMMON_COMPILE_FLAGS = -Wall -pipe `pkg-config --cflags gtk+-2.0` $(OPTS) -pthread -DNDEBUG -DwxUSE_UNICODE -DFFS_LINUX -DTIXML_USE_STL -DWXINTL_NO_GETTEXT_MACRO -+COMMON_LINK_FLAGS = $(OPTS) -pthread - - #default build - FFS_CPPFLAGS = $(COMMON_COMPILE_FLAGS) `wx-config --cxxflags --debug=no --unicode=yes` |