From dd4a2c7a7603bc8dca3a1cf9179a09b2da120739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 17 Apr 2014 22:06:03 -0300
Subject: p7zip-libre-9.20.1-9.2: fix freedom issue #516 =>
 https://labs.parabola.nu/issues/516

---
 libre/p7zip-libre/PKGBUILD                 | 26 +++++++++++++----------
 libre/p7zip-libre/parent-folder-icon.patch | 33 ++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 libre/p7zip-libre/parent-folder-icon.patch

(limited to 'libre/p7zip-libre')

diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index f53c3a28d..101847382 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
 pkgver=9.20.1
-pkgrel=9.1
+pkgrel=9.2
 pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree unrar support'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
@@ -21,25 +21,29 @@ 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"
-          'p7zip-libre.patch')
+          'p7zip-libre.patch' 'parent-folder-icon.patch')
 source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}_${pkgver}_src_all.tar.bz2"
         '7zFM.desktop')
 mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
-            '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed')
-sha1sums=('82a54887878e3fd90bfbd3c66d2ce3b6a3532a95'
+            '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
+            '335a4a38d457d2b0166538d514ffd3c183bbb37f')
+sha1sums=('c6394aef55328b267152a2450f4fc842fcb8be50'
           'f2c370d6f1b286b7ce9a2804e22541b755616a40')
 
 options=('!makeflags')
 install=install
 
 mksource() {
-        cd "${srcdir}/${_pkgname}_${pkgver}"
-    msg "Removing unRar"
-# Generate patch
-#       sed -e '/Rar/d' -i makefile*
-#   find -name '*Rar*' -print0 | xargs -0 rm -rvf
-# Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
-    patch -Np1 -i ../p7zip-libre.patch
+	cd "${srcdir}/${_pkgname}_${pkgver}"
+	msg "Removing unRar"
+	# Generate patch
+	#       sed -e '/Rar/d' -i makefile*
+	#   find -name '*Rar*' -print0 | xargs -0 rm -rvf
+	# Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
+	patch -Np1 -i ../p7zip-libre.patch
+	msg 'Replacing the parent folder icon'
+	rm CPP/7zip/UI/FileManager/res/ParentFolder.h
+	patch -Np1 -i ../parent-folder-icon.patch
 }
 
 prepare() {
diff --git a/libre/p7zip-libre/parent-folder-icon.patch b/libre/p7zip-libre/parent-folder-icon.patch
new file mode 100644
index 000000000..da492b60f
--- /dev/null
+++ b/libre/p7zip-libre/parent-folder-icon.patch
@@ -0,0 +1,33 @@
+diff -ruN p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/FM_rc.cpp
+--- p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp	2010-11-07 16:55:36.000000000 +0100
++++ p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/FM_rc.cpp	2014-04-17 21:41:48.222298740 +0200
+@@ -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 -ruN p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/makefile.depend
+--- p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend	2011-02-19 10:33:17.000000000 +0100
++++ p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/makefile.depend	2014-04-17 21:40:56.504696275 +0200
+@@ -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 \
-- 
cgit v1.2.3-2-g168b