From 50348c8e388a67d0bf5de596d38d7389118852db Mon Sep 17 00:00:00 2001 From: ziggi Date: Fri, 27 Dec 2019 03:43:27 +0000 Subject: [PATCH] update xatchiver --- xapp/codeblocks/Makefile | 6 ++ xapp/inkscape/Makefile | 3 + xapp/xarchiver/Makefile | 12 +-- xapp/xarchiver/distinfo | 5 +- xapp/xarchiver/files/patch-src_bzip2.c | 17 +++++ xapp/xarchiver/files/patch-src_tar.c | 56 ++++++++++++++ xapp/xarchiver/files/patch-src_window.c | 11 +++ xapp/xarchiver/pkg-plist | 99 ++++++++++++++++++++++++- 8 files changed, 198 insertions(+), 11 deletions(-) create mode 100644 xapp/xarchiver/files/patch-src_bzip2.c create mode 100644 xapp/xarchiver/files/patch-src_tar.c create mode 100644 xapp/xarchiver/files/patch-src_window.c diff --git a/xapp/codeblocks/Makefile b/xapp/codeblocks/Makefile index 2d04a425..13ec9ad2 100644 --- a/xapp/codeblocks/Makefile +++ b/xapp/codeblocks/Makefile @@ -23,6 +23,8 @@ RUN_DEPENDS+= gtk-update-icon-cache:gnome/libgtk2 RUN_DEPENDS+= update-desktop-database:xfce/desktop-file-utils + + USES= gmake tar:xz pathfix localbase pkgconfig CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG} CONFIGURE_ARGS+= --with-contrib-plugins=all @@ -32,6 +34,10 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/boost64/lib +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/boost64/include + + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include diff --git a/xapp/inkscape/Makefile b/xapp/inkscape/Makefile index bc25f267..7742745f 100644 --- a/xapp/inkscape/Makefile +++ b/xapp/inkscape/Makefile @@ -37,6 +37,8 @@ LIB_DEPENDS+= libatkmm.so:gnome/libatkmm ##LIB_DEPENDS+= libpotrace.so:graph/libpotrace +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/boost64/lib +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/boost64/include USES+= tar:bz2 python:2.7,build compiler:c++11-lib cmake pathfix @@ -44,6 +46,7 @@ SHEBANG_FILES+= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] SHEBANG_FILES+= share/extensions/*.py share/extensions/genpofiles.sh SHEBANG_FILES+= fix-roff-punct +CMAKE_ARGS+= -DBOOST_ROOT=${LOCALBASE}/boost64 CMAKE_ARGS+= -DWITH_GNOME_VFS:BOOL=NO CMAKE_ARGS+= -DWITH_LIBCDR:BOOL=YES diff --git a/xapp/xarchiver/Makefile b/xapp/xarchiver/Makefile index c3abffe6..0372f981 100644 --- a/xapp/xarchiver/Makefile +++ b/xapp/xarchiver/Makefile @@ -2,10 +2,10 @@ # $Id$ # PORTNAME= xarchiver -PORTVERSION= 0.5.4 +PORTVERSION= 0.5.4.7 CATEGORIES= archivers -MASTER_SITES= SF -MASTER_SITE_SUBDIR= ${PORTNAME:tl} +#MASTER_SITES= SF +#MASTER_SITE_SUBDIR= ${PORTNAME:tl} MAINTAINER= onborodin@gmail.com COMMENT= Desktop-agnostic GTK+2 frontend to various archiving tools @@ -16,9 +16,11 @@ LIB_DEPENDS+= libgtk-x11.so:gnome/libgtk2 RUN_DEPENDS+= gtk-update-icon-cache:gnome/libgtk2 RUN_DEPENDS+= update-desktop-database:xfce/desktop-file-utils +USE_GITHUB= yes +GH_ACCOUNT= ib -USES+= gmake -USES+= tar:bzip2 + +USES+= gmake #tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/xapp/xarchiver/distinfo b/xapp/xarchiver/distinfo index 159230d4..6ebaceeb 100644 --- a/xapp/xarchiver/distinfo +++ b/xapp/xarchiver/distinfo @@ -1,2 +1,3 @@ -SHA256 (xarchiver-0.5.4.tar.bz2) = e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4 -SIZE (xarchiver-0.5.4.tar.bz2) = 1003045 +TIMESTAMP = 1577414466 +SHA256 (ib-xarchiver-0.5.4.7_GH0.tar.gz) = 73a018f14dbb0d6eda9759103cb31ebef65f12a4297dc7a00a770d5395f2ad21 +SIZE (ib-xarchiver-0.5.4.7_GH0.tar.gz) = 985956 diff --git a/xapp/xarchiver/files/patch-src_bzip2.c b/xapp/xarchiver/files/patch-src_bzip2.c new file mode 100644 index 00000000..debaa115 --- /dev/null +++ b/xapp/xarchiver/files/patch-src_bzip2.c @@ -0,0 +1,17 @@ +--- src/bzip2.c.orig 2016-07-19 21:54:07 UTC ++++ src/bzip2.c +@@ -176,11 +176,11 @@ void xa_open_tar_compressed_file(XArchiv + if (archive->type == XARCHIVETYPE_TAR_BZ2) + command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL); + else if (archive->type == XARCHIVETYPE_TAR_LZMA) +- command = g_strconcat(tar," tv --use-compress-program=lzma -f ",archive->escaped_path,NULL); ++ command = g_strconcat(tar," tv --use-compress-program='lzma -d' -f ",archive->escaped_path,NULL); + else if (archive->type == XARCHIVETYPE_TAR_XZ) +- command = g_strconcat(tar," tv --use-compress-program=xz -f ",archive->escaped_path,NULL); ++ command = g_strconcat(tar," tv --use-compress-program='xz -d' -f ",archive->escaped_path,NULL); + else if (archive->type == XARCHIVETYPE_TAR_LZOP) +- command = g_strconcat(tar," tv --use-compress-program=lzop -f ",archive->escaped_path,NULL); ++ command = g_strconcat(tar," tv --use-compress-program='lzop -d' -f ",archive->escaped_path,NULL); + /* else fail? */ + + archive->has_properties = archive->can_add = archive->can_extract = archive->has_test = TRUE; diff --git a/xapp/xarchiver/files/patch-src_tar.c b/xapp/xarchiver/files/patch-src_tar.c new file mode 100644 index 00000000..3722360b --- /dev/null +++ b/xapp/xarchiver/files/patch-src_tar.c @@ -0,0 +1,56 @@ +--- src/tar.c.orig 2016-07-19 21:54:07 UTC ++++ src/tar.c +@@ -334,7 +334,7 @@ gboolean xa_tar_extract(XArchive *archiv + #else + archive->overwrite ? " --overwrite" : " --keep-old-files", + #endif +- archive->tar_touch ? " --touch" : "", ++ archive->tar_touch ? " -m" : "", + " -C ",archive->extraction_path," ",names->str,NULL); + } + else +@@ -353,7 +353,7 @@ gboolean xa_tar_extract(XArchive *archiv + #else + archive->overwrite ? " --overwrite" : " --keep-old-files", + #endif +- archive->tar_touch ? " --touch" : "", ++ archive->tar_touch ? " -m" : "", + " -C ",archive->extraction_path," ",names->str,NULL); + } + else +@@ -372,7 +372,7 @@ gboolean xa_tar_extract(XArchive *archiv + #else + archive->overwrite ? " --overwrite" : " --keep-old-files", + #endif +- archive->tar_touch ? " --touch" : "", ++ archive->tar_touch ? " -m" : "", + " -C ",archive->extraction_path," ",names->str,NULL); + } + else +@@ -391,7 +391,7 @@ gboolean xa_tar_extract(XArchive *archiv + #else + archive->overwrite ? " --overwrite" : " --keep-old-files", + #endif +- archive->tar_touch ? " --touch" : "", ++ archive->tar_touch ? " -m" : "", + " -C ",archive->extraction_path," ",names->str,NULL); + } + else +@@ -410,7 +410,7 @@ gboolean xa_tar_extract(XArchive *archiv + #else + archive->overwrite ? " --overwrite" : " --keep-old-files", + #endif +- archive->tar_touch ? " --touch" : "", ++ archive->tar_touch ? " -m" : "", + " -C ",archive->extraction_path," ",names->str,NULL); + } + else +@@ -429,7 +429,7 @@ gboolean xa_tar_extract(XArchive *archiv + #else + archive->overwrite ? " --overwrite" : " --keep-old-files", + #endif +- archive->tar_touch ? " --touch" : "", ++ archive->tar_touch ? " -m" : "", + " -C ",archive->extraction_path," ",names->str,NULL); + } + else diff --git a/xapp/xarchiver/files/patch-src_window.c b/xapp/xarchiver/files/patch-src_window.c new file mode 100644 index 00000000..6d7f91b6 --- /dev/null +++ b/xapp/xarchiver/files/patch-src_window.c @@ -0,0 +1,11 @@ +--- src/window.c.orig 2016-07-19 21:54:07 UTC ++++ src/window.c +@@ -1181,7 +1181,7 @@ XArchiveType xa_detect_archive_type (gch + xx = XARCHIVETYPE_BZIP2; + else if (memcmp ( magic,"\x1f\x8b",2) == 0 || memcmp ( magic,"\x1f\x9d",2) == 0) + xx = XARCHIVETYPE_GZIP; +- else if (memcmp ( magic,"\x5d\x00\x00\x80",4) == 0) ++ else if (memcmp ( magic,"\x5d\x00\x00",3) == 0) + xx = XARCHIVETYPE_LZMA; + else if (memcmp ( magic,"\xfd\x37\x7a\x58\x5a",5) == 0) + xx = XARCHIVETYPE_XZ; diff --git a/xapp/xarchiver/pkg-plist b/xapp/xarchiver/pkg-plist index a2aa1c9e..156b08c6 100644 --- a/xapp/xarchiver/pkg-plist +++ b/xapp/xarchiver/pkg-plist @@ -1,38 +1,96 @@ bin/xarchiver libexec/thunar-archive-plugin/xarchiver.tap share/applications/xarchiver.desktop +share/doc/xarchiver/ch01.html +share/doc/xarchiver/ch01s01.html +share/doc/xarchiver/ch01s02.html +share/doc/xarchiver/ch01s03.html +share/doc/xarchiver/ch02.html +share/doc/xarchiver/ch02s01.html +share/doc/xarchiver/ch02s02.html +share/doc/xarchiver/ch03.html +share/doc/xarchiver/ch03s01.html +share/doc/xarchiver/ch03s02.html +share/doc/xarchiver/ch03s03.html +share/doc/xarchiver/ch03s04.html +share/doc/xarchiver/ch04.html +share/doc/xarchiver/ch04s01.html +share/doc/xarchiver/ch04s02.html +share/doc/xarchiver/ch04s03.html +share/doc/xarchiver/ch04s04.html +share/doc/xarchiver/ch04s05.html +share/doc/xarchiver/ch04s06.html +share/doc/xarchiver/ChangeLog +share/doc/xarchiver/COPYING +share/doc/xarchiver/images/add_dialog.png +share/doc/xarchiver/images/archive_comment_dialog.png +share/doc/xarchiver/images/archive_properties.png +share/doc/xarchiver/images/extract_dialog.png +share/doc/xarchiver/images/multi_extract_dialog.png +share/doc/xarchiver/images/new_dialog.png +share/doc/xarchiver/images/password_dialog.png +share/doc/xarchiver/images/pref_dialog.png +share/doc/xarchiver/index.html +share/doc/xarchiver/README +share/doc/xarchiver/xarchiver.css share/icons/hicolor/16x16/apps/xarchiver.png share/icons/hicolor/24x24/apps/xarchiver.png share/icons/hicolor/48x48/apps/xarchiver.png share/icons/hicolor/scalable/apps/xarchiver.svg +share/locale/ar/LC_MESSAGES/xarchiver.mo +share/locale/ast/LC_MESSAGES/xarchiver.mo share/locale/bg/LC_MESSAGES/xarchiver.mo share/locale/ca/LC_MESSAGES/xarchiver.mo share/locale/cs/LC_MESSAGES/xarchiver.mo share/locale/da/LC_MESSAGES/xarchiver.mo share/locale/de/LC_MESSAGES/xarchiver.mo +share/locale/dz/LC_MESSAGES/xarchiver.mo share/locale/el/LC_MESSAGES/xarchiver.mo share/locale/en_GB/LC_MESSAGES/xarchiver.mo share/locale/es/LC_MESSAGES/xarchiver.mo share/locale/eu/LC_MESSAGES/xarchiver.mo share/locale/fi/LC_MESSAGES/xarchiver.mo share/locale/fr/LC_MESSAGES/xarchiver.mo +share/locale/gl/LC_MESSAGES/xarchiver.mo +share/locale/he/LC_MESSAGES/xarchiver.mo +share/locale/hr/LC_MESSAGES/xarchiver.mo share/locale/hu/LC_MESSAGES/xarchiver.mo share/locale/id/LC_MESSAGES/xarchiver.mo +share/locale/it/LC_MESSAGES/xarchiver.mo share/locale/ja/LC_MESSAGES/xarchiver.mo -share/locale/nb_NO/LC_MESSAGES/xarchiver.mo +share/locale/kk/LC_MESSAGES/xarchiver.mo +share/locale/ku/LC_MESSAGES/xarchiver.mo +share/locale/lv/LC_MESSAGES/xarchiver.mo +share/locale/nb/LC_MESSAGES/xarchiver.mo share/locale/nl/LC_MESSAGES/xarchiver.mo +share/locale/pa/LC_MESSAGES/xarchiver.mo share/locale/pl/LC_MESSAGES/xarchiver.mo share/locale/pt_BR/LC_MESSAGES/xarchiver.mo share/locale/pt_PT/LC_MESSAGES/xarchiver.mo +share/locale/ro/LC_MESSAGES/xarchiver.mo share/locale/ru/LC_MESSAGES/xarchiver.mo +share/locale/si/LC_MESSAGES/xarchiver.mo +share/locale/sk/LC_MESSAGES/xarchiver.mo share/locale/sq/LC_MESSAGES/xarchiver.mo share/locale/sv/LC_MESSAGES/xarchiver.mo +share/locale/te/LC_MESSAGES/xarchiver.mo share/locale/tr/LC_MESSAGES/xarchiver.mo +share/locale/ug/LC_MESSAGES/xarchiver.mo share/locale/uk/LC_MESSAGES/xarchiver.mo +share/locale/ur/LC_MESSAGES/xarchiver.mo +share/locale/zh_CN/LC_MESSAGES/xarchiver.mo +share/locale/zh_TW/LC_MESSAGES/xarchiver.mo share/pixmaps/xarchiver/xarchiver-add.png share/pixmaps/xarchiver/xarchiver-extract.png share/pixmaps/xarchiver/xarchiver-html.png @dir libexec/thunar-archive-plugin +@dir share/applications +@dir share/doc/xarchiver/images +@dir share/doc/xarchiver +@dir share/locale/ar/LC_MESSAGES +@dir share/locale/ar +@dir share/locale/ast/LC_MESSAGES +@dir share/locale/ast @dir share/locale/bg/LC_MESSAGES @dir share/locale/bg @dir share/locale/ca/LC_MESSAGES @@ -43,6 +101,8 @@ share/pixmaps/xarchiver/xarchiver-html.png @dir share/locale/da @dir share/locale/de/LC_MESSAGES @dir share/locale/de +@dir share/locale/dz/LC_MESSAGES +@dir share/locale/dz @dir share/locale/el/LC_MESSAGES @dir share/locale/el @dir share/locale/en_GB/LC_MESSAGES @@ -55,31 +115,62 @@ share/pixmaps/xarchiver/xarchiver-html.png @dir share/locale/fi @dir share/locale/fr/LC_MESSAGES @dir share/locale/fr +@dir share/locale/gl/LC_MESSAGES +@dir share/locale/gl +@dir share/locale/he/LC_MESSAGES +@dir share/locale/he +@dir share/locale/hr/LC_MESSAGES +@dir share/locale/hr @dir share/locale/hu/LC_MESSAGES @dir share/locale/hu @dir share/locale/id/LC_MESSAGES @dir share/locale/id +@dir share/locale/it/LC_MESSAGES +@dir share/locale/it @dir share/locale/ja/LC_MESSAGES @dir share/locale/ja -@dir share/locale/nb_NO/LC_MESSAGES -@dir share/locale/nb_NO +@dir share/locale/kk/LC_MESSAGES +@dir share/locale/kk +@dir share/locale/ku/LC_MESSAGES +@dir share/locale/ku +@dir share/locale/lv/LC_MESSAGES +@dir share/locale/lv +@dir share/locale/nb/LC_MESSAGES +@dir share/locale/nb @dir share/locale/nl/LC_MESSAGES @dir share/locale/nl +@dir share/locale/pa/LC_MESSAGES +@dir share/locale/pa @dir share/locale/pl/LC_MESSAGES @dir share/locale/pl @dir share/locale/pt_BR/LC_MESSAGES @dir share/locale/pt_BR @dir share/locale/pt_PT/LC_MESSAGES @dir share/locale/pt_PT +@dir share/locale/ro/LC_MESSAGES +@dir share/locale/ro @dir share/locale/ru/LC_MESSAGES @dir share/locale/ru +@dir share/locale/si/LC_MESSAGES +@dir share/locale/si +@dir share/locale/sk/LC_MESSAGES +@dir share/locale/sk @dir share/locale/sq/LC_MESSAGES @dir share/locale/sq @dir share/locale/sv/LC_MESSAGES @dir share/locale/sv +@dir share/locale/te/LC_MESSAGES +@dir share/locale/te @dir share/locale/tr/LC_MESSAGES @dir share/locale/tr +@dir share/locale/ug/LC_MESSAGES +@dir share/locale/ug @dir share/locale/uk/LC_MESSAGES @dir share/locale/uk -@dir share/locale +@dir share/locale/ur/LC_MESSAGES +@dir share/locale/ur +@dir share/locale/zh_CN/LC_MESSAGES +@dir share/locale/zh_CN +@dir share/locale/zh_TW/LC_MESSAGES +@dir share/locale/zh_TW @dir share/pixmaps/xarchiver