Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

4 files changed, 281 insertions, 0 deletions

diff --git a/libre/p7zip/7zFM.desktop b/libre/p7zip/7zFM.desktop
new file mode 100644
index 000000000..62b8e8562
--- /dev/null
+++ b/libre/p7zip/7zFM.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=7-Zip FM
+GenericName=7-Zip File Manager
+Type=Application
+Categories=GTK;Utility;Archiving;Compression;
+Terminal=false
+Icon=p7zip
+Exec=7zFM
diff --git a/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD
new file mode 100644
index 000000000..b34262451
--- /dev/null
+++ b/libre/p7zip/PKGBUILD
@@ -0,0 +1,89 @@
+# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $
+# Contributor (Arch): Thayer Williams <thayer@archlinux.org>
+# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
+# Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+
+_pkgname=p7zip-libre
+pkgname=p7zip
+pkgver=9.20.1
+pkgrel=9.parabola1
+pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives'
+url='http://p7zip.sourceforge.net/'
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+conflicts=('p7zip-libre')
+replaces=('p7zip-libre')
+depends=('gcc-libs' 'bash')
+optdepends=('wxgtk2.8: GUI'
+            'desktop-file-utils: desktop entries')
+makedepends=('yasm' 'nasm' 'wxgtk2.8')
+mksource=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2")
+source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2"
+        '7zFM.desktop' 'libre.patch')
+mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7')
+sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8'
+          'f2c370d6f1b286b7ce9a2804e22541b755616a40'
+          'bd929fdcbc05dcc783f7fa7d156ed15d38b0b4b3')
+
+options=('!makeflags')
+install=install
+
+mksource() {
+	cd "${srcdir}/${pkgname}_${pkgver}"
+
+	# Remove nonfree unRAR utility files from the source
+	rm -rv CPP/7zip/{Archive,Compress}/Rar
+	rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp}
+	rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h}
+	rm -v DOCS/unRarLicense.txt
+
+	# Remove nonfree parent folder icon
+	rm CPP/7zip/UI/FileManager/res/ParentFolder.h
+}
+
+prepare() {
+	cd "${srcdir}/${pkgname}_${pkgver}"
+
+	# remove rar and parent folder icon references
+	patch -Np1 -i ../libre.patch
+
+	rm GUI/kde4/p7zip_compress.desktop
+	[[ $CARCH = x86_64 ]] \
+	&& cp makefile.linux_amd64_asm makefile.machine \
+	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+
+	sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \
+		CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile
+}
+
+build() {
+	cd "${srcdir}/${pkgname}_${pkgver}"
+	make all4 OPTFLAGS="${CXXFLAGS}"
+}
+
+package() {
+	cd "${srcdir}/${pkgname}_${pkgver}"
+	make install \
+		DEST_DIR="${pkgdir}" \
+		DEST_HOME="/usr" \
+		DEST_MAN="/usr/share/man"
+
+	# Licenses
+	install -d "${pkgdir}"/usr/share/licenses/p7zip
+	ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \
+		/usr/share/doc/p7zip/DOCS/License.txt
+
+	# Integration with stuff...
+	install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
+	install -d "${pkgdir}"/usr/share/{applications,kde4/services/ServiceMenus}
+	cp GUI/kde4/* "${pkgdir}"/usr/share/kde4/services/ServiceMenus/
+	cp ../7zFM.desktop "${pkgdir}"/usr/share/applications/
+	ln -s 7zCon.sfx "${pkgdir}"/usr/lib/p7zip/7z.sfx
+
+	find GUI/help -type d -exec chmod 755 {} \;
+	cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
+
+	chmod -R u+w "${pkgdir}/usr"
+}
diff --git a/libre/p7zip/install b/libre/p7zip/install
new file mode 100644
index 000000000..7f3cc4358
--- /dev/null
+++ b/libre/p7zip/install
@@ -0,0 +1,13 @@
+post_install() {
+	[[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+	[[ -x usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor || true
+}
+
+post_upgrade() {
+	post_install
+}
+
+
+post_remove() {
+	post_install
+}
diff --git a/libre/p7zip/libre.patch b/libre/p7zip/libre.patch
new file mode 100644
index 000000000..86b2caebc
--- /dev/null
+++ b/libre/p7zip/libre.patch
@@ -0,0 +1,170 @@
+diff -Nur p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile
+--- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile	2010-11-07 13:41:43.000000000 -0200
++++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile	2014-05-03 11:19:47.618563272 -0300
+@@ -158,14 +158,6 @@
+   NsisIn.o \
+   NsisRegister.o \
+ 
+-RAR_OBJS = \
+-  RarHandler.o \
+-  RarHeader.o \
+-  RarIn.o \
+-  RarItem.o \
+-  RarVolumeInStream.o \
+-  RarRegister.o \
+-
+ TAR_OBJS = \
+   TarHandler.o \
+   TarHandlerOut.o \
+@@ -243,13 +235,6 @@
+   ZlibEncoder.o \
+   ZDecoder.o \
+ 
+-COMPRESS_OBJS_NON_FREE = \
+-  Rar1Decoder.o \
+-  Rar2Decoder.o \
+-  Rar3Decoder.o \
+-  Rar3Vm.o \
+-  RarCodecsRegister.o \
+-
+ CRYPTO_OBJS = \
+   7zAes.o \
+   7zAesRegister.o \
+@@ -257,8 +242,6 @@
+   MyAes.o \
+   Pbkdf2HmacSha1.o \
+   RandGen.o \
+-  Rar20Crypto.o \
+-  RarAes.o \
+   Sha1.o \
+   WzAes.o \
+   ZipCrypto.o \
+diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp
+--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp	2010-11-07 13:55:36.000000000 -0200
++++ p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp	2014-05-03 11:28:17.542065931 -0300
+@@ -774,8 +774,6 @@
+ 
+ /////////////////////////////////////////////////////
+ 
+-#include "res/ParentFolder.h"
+-
+ 	SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) :
+ 	       	wxPanel(parent,id) , m_frame(frame), _wList(0)
+ 	{
+@@ -793,7 +791,7 @@
+ 		int sizes[] = {150, 250, 350, -1};
+ 		wxArrayString pathArray;
+ 		wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL);
+-		m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
++		m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW);
+ 		m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT );
+ 		pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0);
+ 		pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5);
+diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend
+--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend	2011-02-19 07:33:17.000000000 -0200
++++ p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend	2014-05-03 11:28:17.545399286 -0300
+@@ -714,7 +714,7 @@
+  res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \
+  res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \
+  ../../../Common/MyString.h ../../../Windows/ResourceString.h \
+- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h
++ /usr/include/wx-2.8/wx/mstream.h
+ OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \
+  ../../../myWindows/config.h ../../../Common/MyWindows.h \
+  ../../../Common/MyGuidDef.h ../../../Common/Types.h \
+diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile
+--- p7zip_9.20.1.orig/makefile	2011-03-13 08:52:45.000000000 -0300
++++ p7zip_9.20.1/makefile	2014-05-03 11:19:47.618563272 -0300
+@@ -56,7 +56,6 @@
+ 	$(MAKE) -C CPP/7zip/UI/Client7z           depend
+ 	$(MAKE) -C CPP/7zip/UI/Console            depend
+ 	$(MAKE) -C CPP/7zip/Bundles/Format7zFree  depend
+-	$(MAKE) -C CPP/7zip/Compress/Rar          depend
+ 	$(MAKE) -C CPP/7zip/UI/GUI                depend
+ 	$(MAKE) -C CPP/7zip/UI/FileManager        depend
+ 	$(MAKE) -C check/my_86_filter             depend
+@@ -68,7 +67,6 @@
+ common7z:common
+ 	$(MKDIR) bin/Codecs
+ 	$(MAKE) -C CPP/7zip/Bundles/Format7zFree all
+-	$(MAKE) -C CPP/7zip/Compress/Rar         all
+ 
+ 7z: common7z
+ 	$(MAKE) -C CPP/7zip/UI/Console           all
+@@ -93,7 +91,6 @@
+ 	$(MAKE) -C CPP/7zip/UI/FileManager       clean
+ 	$(MAKE) -C CPP/7zip/UI/GUI               clean
+ 	$(MAKE) -C CPP/7zip/Bundles/Format7zFree clean
+-	$(MAKE) -C CPP/7zip/Compress/Rar         clean
+ 	$(MAKE) -C CPP/7zip/Compress/LZMA_Alone  clean
+ 	$(MAKE) -C CPP/7zip/Bundles/AloneGCOV    clean
+ 	$(MAKE) -C CPP/7zip/TEST/TestUI          clean
+diff -Nur p7zip_9.20.1.orig/makefile.oldmake p7zip_9.20.1/makefile.oldmake
+--- p7zip_9.20.1.orig/makefile.oldmake	2011-03-13 08:53:08.000000000 -0300
++++ p7zip_9.20.1/makefile.oldmake	2014-05-03 11:19:47.618563272 -0300
+@@ -56,7 +56,6 @@
+ 	cd CPP/7zip/UI/Client7z          ; $(MAKE) depend
+ 	cd CPP/7zip/UI/Console           ; $(MAKE) depend
+ 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
+-	cd CPP/7zip/Compress/Rar         ; $(MAKE) depend
+ 	cd CPP/7zip/UI/GUI               ; $(MAKE) depend
+ 	cd CPP/7zip/UI/FileManager       ; $(MAKE) depend
+ 	cd check/my_86_filter            ; $(MAKE) depend
+@@ -68,7 +67,6 @@
+ common7z:common
+ 	$(MKDIR) bin/Codecs
+ 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
+-	cd CPP/7zip/Compress/Rar         ; $(MAKE) all
+ 
+ 7z: common7z
+ 	cd CPP/7zip/UI/Console           ; $(MAKE) all
+@@ -93,7 +91,6 @@
+ 	cd CPP/7zip/UI/FileManager       ; $(MAKE) clean
+ 	cd CPP/7zip/UI/GUI               ; $(MAKE) clean
+ 	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
+-	cd CPP/7zip/Compress/Rar         ; $(MAKE) clean
+ 	cd CPP/7zip/Compress/LZMA_Alone  ; $(MAKE) clean
+ 	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean
+ 	cd CPP/7zip/TEST/TestUI          ; $(MAKE) clean
+diff -Nur p7zip_9.20.1.orig/makefile.qnx_shared.so p7zip_9.20.1/makefile.qnx_shared.so
+--- p7zip_9.20.1.orig/makefile.qnx_shared.so	2007-06-28 04:34:14.000000000 -0300
++++ p7zip_9.20.1/makefile.qnx_shared.so	2014-05-03 11:19:47.618563272 -0300
+@@ -1,5 +1,4 @@
+ ###################################################
+-# makefile.machine for "7z.so , Codecs/Rar29.so" :
+ # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
+ 
+ OPTFLAGS=-O
+diff -Nur p7zip_9.20.1.orig/makefile.rules p7zip_9.20.1/makefile.rules
+--- p7zip_9.20.1.orig/makefile.rules	2010-11-07 14:08:51.000000000 -0200
++++ p7zip_9.20.1/makefile.rules	2014-05-03 11:19:47.621896630 -0300
+@@ -448,18 +448,6 @@
+ NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp
+ 	$(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp
+ 
+-RarHandler.o : ../../Archive/Rar/RarHandler.cpp
+-	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp
+-RarHeader.o : ../../Archive/Rar/RarHeader.cpp
+-	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp
+-RarIn.o : ../../Archive/Rar/RarIn.cpp
+-	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp
+-RarItem.o : ../../Archive/Rar/RarItem.cpp
+-	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp
+-RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp
+-	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp
+-RarRegister.o : ../../Archive/Rar/RarRegister.cpp
+-	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp
+ 
+ UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp
+ 	$(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp
+@@ -535,10 +523,6 @@
+ 	$(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp
+ WzAes.o : ../../Crypto/WzAes.cpp
+ 	$(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp
+-Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp
+-	$(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp
+-RarAes.o : ../../Crypto/RarAes.cpp
+-	$(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp
+ HmacSha1.o : ../../Crypto/HmacSha1.cpp
+ 	$(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp
+ Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp