[arch-commits] Commit in tuxcmd-modules/repos (6 files)

Felix Yan felixonmars at archlinux.org
Tue Jul 7 16:16:28 UTC 2020


    Date: Tuesday, July 7, 2020 @ 16:16:27
  Author: felixonmars
Revision: 659195

archrelease: copy trunk to community-staging-x86_64

Added:
  tuxcmd-modules/repos/community-staging-x86_64/
  tuxcmd-modules/repos/community-staging-x86_64/PKGBUILD
    (from rev 659193, tuxcmd-modules/trunk/PKGBUILD)
  tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-gvfs_include-glib.patch
    (from rev 659193, tuxcmd-modules/trunk/tuxcmd-module-gvfs_include-glib.patch)
  tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-libarchive_libarchive-3.0.0a.patch
    (from rev 659193, tuxcmd-modules/trunk/tuxcmd-module-libarchive_libarchive-3.0.0a.patch)
  tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7-2.patch
    (from rev 659194, tuxcmd-modules/trunk/tuxcmd-module-ziparchive-gcc-4.7-2.patch)
  tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7.patch
    (from rev 659194, tuxcmd-modules/trunk/tuxcmd-module-ziparchive-gcc-4.7.patch)

--------------------------------------------------+
 PKGBUILD                                         |   46 +++++++++++++
 tuxcmd-module-gvfs_include-glib.patch            |   11 +++
 tuxcmd-module-libarchive_libarchive-3.0.0a.patch |   11 +++
 tuxcmd-module-ziparchive-gcc-4.7-2.patch         |   35 ++++++++++
 tuxcmd-module-ziparchive-gcc-4.7.patch           |   73 +++++++++++++++++++++
 5 files changed, 176 insertions(+)

Copied: tuxcmd-modules/repos/community-staging-x86_64/PKGBUILD (from rev 659193, tuxcmd-modules/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 16:16:27 UTC (rev 659195)
@@ -0,0 +1,46 @@
+# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+
+pkgname=tuxcmd-modules
+pkgver=0.6.70
+pkgrel=6
+pkgdesc='Modules for Tux Commander'
+arch=('x86_64')
+url='http://tuxcmd.sourceforge.net/'
+license=('GPL')
+depends=('tuxcmd')
+makedepends=('sharutils')
+optdepends=('gvfs: for gvfs module')
+options=('!docs' '!emptydirs')
+source=("https://downloads.sourceforge.net/project/tuxcmd/tuxcmd/tuxcmd-dev-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        tuxcmd-module-gvfs_include-glib.patch
+		tuxcmd-module-libarchive_libarchive-3.0.0a.patch
+		tuxcmd-module-ziparchive-gcc-4.7-2.patch
+		tuxcmd-module-ziparchive-gcc-4.7.patch)
+sha512sums=('a89f33441380ca1cb6cc396ddc05ff969ce45edf204c4f4c6402b6b077f5dfb166073e862593efd782171e31f3dbc81a38e6a9e8898eb1ef46459109adff1f62'
+            '43314fc5da886e451a494b7f486a253e70c0185e7a7c41c243ad955ac28e69fc696a9ded551b60712b5465220bd0e41e8f6d8417dc79a255a5d0231f017ba0af'
+            '1d2c3c3d4f76aeb150619139ed2e359b3b90b4670b3ca35388ead2357ebebb442fc9ca438868749fcd6e40f9198cc53f8f5bfa24e996bb1d446f6f0d1ba210d5'
+            '8a3256cd31c33f327b10212fbaed49a7130a5cb343a1a108dbcf83c40dcfd91ea46e73161ae6ee5143583cbd4b6b67683703bbd9d7eba5702820de915d849c11'
+            '692d5fedd32944c203b9e02f53c4f6d778fe06f253e3abbfc49abd18e4532ce39b3088eb6efc04c399864c977435d411293cb114c1222285907c7326fbd2323c')
+
+prepare() {
+	cd ${pkgname}-${pkgver}
+	patch -p1 -i ../tuxcmd-module-gvfs_include-glib.patch
+	patch -p1 -i ../tuxcmd-module-libarchive_libarchive-3.0.0a.patch
+	patch -p1 -i ../tuxcmd-module-ziparchive-gcc-4.7.patch
+	patch -p1 -i ../tuxcmd-module-ziparchive-gcc-4.7-2.patch
+
+
+	sed -i 's|$(INSTALL) \(.*\) $(DESTDIR)/lib$(LIB_SUFFIX)/tuxcmd/|$(INSTALL) -D \1 $(DESTDIR)/lib/tuxcmd/\1|' */Makefile
+}
+
+build() {
+	cd ${pkgname}-${pkgver}
+
+	make
+}
+
+package() {
+	cd ${pkgname}-${pkgver}
+
+	make DESTDIR=${pkgdir}/usr install
+}

Copied: tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-gvfs_include-glib.patch (from rev 659193, tuxcmd-modules/trunk/tuxcmd-module-gvfs_include-glib.patch)
===================================================================
--- community-staging-x86_64/tuxcmd-module-gvfs_include-glib.patch	                        (rev 0)
+++ community-staging-x86_64/tuxcmd-module-gvfs_include-glib.patch	2020-07-07 16:16:27 UTC (rev 659195)
@@ -0,0 +1,11 @@
+--- tuxcmd-modules-0.6.70/gvfs/gvfs.c.orig	2011-11-20 14:07:03.990300572 +0000
++++ tuxcmd-modules-0.6.70/gvfs/gvfs.c	2011-11-20 14:07:19.440300466 +0000
+@@ -25,7 +25,7 @@
+ #include <errno.h>
+ 
+ #include <gio/gio.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "vfs_types.h"
+ 

Copied: tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-libarchive_libarchive-3.0.0a.patch (from rev 659193, tuxcmd-modules/trunk/tuxcmd-module-libarchive_libarchive-3.0.0a.patch)
===================================================================
--- community-staging-x86_64/tuxcmd-module-libarchive_libarchive-3.0.0a.patch	                        (rev 0)
+++ community-staging-x86_64/tuxcmd-module-libarchive_libarchive-3.0.0a.patch	2020-07-07 16:16:27 UTC (rev 659195)
@@ -0,0 +1,11 @@
+--- tuxcmd-modules-0.6.70/libarchive/libarchive.c.orig	2011-11-20 12:49:20.348256064 +0000
++++ tuxcmd-modules-0.6.70/libarchive/libarchive.c	2011-11-20 12:50:10.253257075 +0000
+@@ -141,7 +141,7 @@
+ 
+   module_info->ID = g_strdup ("libarchive_plugin");
+   module_info->Name = g_strdup ("libarchive plugin");
+-  module_info->About = g_strdup_printf ("version %s, build date: %s\nusing %s\n", VERSION, BUILD_DATE, ARCHIVE_LIBRARY_VERSION);
++  module_info->About = g_strdup_printf ("version %s, build date: %s\nusing %s\n", VERSION, BUILD_DATE, archive_version_string());
+   module_info->Copyright = g_strdup ("Plugin Copyright (C) 2008-2009 Tomáš Bžatek\nlibarchive sources Copyright (c) 2003-2007 Tim Kientzle");
+ 
+   return module_info;

Copied: tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7-2.patch (from rev 659194, tuxcmd-modules/trunk/tuxcmd-module-ziparchive-gcc-4.7-2.patch)
===================================================================
--- community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7-2.patch	                        (rev 0)
+++ community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7-2.patch	2020-07-07 16:16:27 UTC (rev 659195)
@@ -0,0 +1,35 @@
+From f4d8292cf67ab481a27ea88f04e2edd6dc16119e Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at redhat.com>
+Date: Fri, 3 Feb 2012 15:37:06 +0100
+Subject: [PATCH] ZipArchive: More complete fix for gcc-4.7
+
+Reverting the #ifdef changes I did last time and adding an include
+should do the trick. More testing on older platforms is needed though.
+---
+ zip/ZipArchive/stdafx.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/zip/ZipArchive/stdafx.h b/zip/ZipArchive/stdafx.h
+index db54a41..ddb2fd4 100644
+--- a/zip/ZipArchive/stdafx.h
++++ b/zip/ZipArchive/stdafx.h
+@@ -23,6 +23,7 @@
+ 
+ #include "_features.h"
+ #include "_platform.h"
++#include <unistd.h>
+ 
+ #if _MSC_VER > 1000
+ 	#pragma once
+@@ -67,7 +68,7 @@
+ 	#define ZIP_SIZE_TYPE DWORD
+ 	#define ZIP_ZLIB_TYPE int
+ 
+-#if !defined(_INTPTR_T_DEFINED)
++#if !defined(_INTPTR_T_DEFINED) && !defined(__GNUC__)
+ 	#if defined (__BORLANDC__)
+ 		#include <stdint.h>
+ 	#elif _MSC_VER <= 1200 || !defined _MSC_VER
+-- 
+1.7.8.4
+

Copied: tuxcmd-modules/repos/community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7.patch (from rev 659194, tuxcmd-modules/trunk/tuxcmd-module-ziparchive-gcc-4.7.patch)
===================================================================
--- community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7.patch	                        (rev 0)
+++ community-staging-x86_64/tuxcmd-module-ziparchive-gcc-4.7.patch	2020-07-07 16:16:27 UTC (rev 659195)
@@ -0,0 +1,73 @@
+From e932ebbf029a4cdb38c61a838e8f3669debd410e Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at redhat.com>
+Date: Tue, 31 Jan 2012 13:19:50 +0000
+Subject: ZipArchive: GCC 4.7 compatibility
+
+---
+diff --git a/zip/ZipArchive/ZipCollections_stl.h b/zip/ZipArchive/ZipCollections_stl.h
+index 8792a6e..3facaad 100644
+--- a/zip/ZipArchive/ZipCollections_stl.h
++++ b/zip/ZipArchive/ZipCollections_stl.h
+@@ -86,10 +86,10 @@ public:
+ 	}
+ 	TYPE& GetAt(size_t uIndex) {return this->at(uIndex);}
+ 	const TYPE& GetAt(size_t uIndex) const {return this->at(uIndex);} 
+-	size_t Add(const TYPE& x) {push_back(x);return GetUpperBound();}
++	size_t Add(const TYPE& x) {this->push_back(x);return GetUpperBound();}
+ 	void RemoveAll() {this->clear();}
+-	void RemoveAt(size_t uIndex) { erase(GetIterFromIndex(uIndex));}
+-	void InsertAt(size_t uIndex, const TYPE& x){insert(GetIterFromIndex(uIndex), x);}
++	void RemoveAt(size_t uIndex) { this->erase(GetIterFromIndex(uIndex));}
++	void InsertAt(size_t uIndex, const TYPE& x){this->insert(GetIterFromIndex(uIndex), x);}
+ 
+ 	TYPE& operator[](size_t uIndex)
+ 	{
+@@ -114,8 +114,8 @@ public:
+ 	typedef typename std::list<TYPE>::iterator iterator;
+ 	typedef typename std::list<TYPE>::const_iterator const_iterator;
+ 	size_t GetCount() const {return this->size();}
+-	void AddTail(const TYPE& x){push_back(x);}
+-	void AddHead(const TYPE& x){push_front(x);}
++	void AddTail(const TYPE& x){this->push_back(x);}
++	void AddHead(const TYPE& x){this->push_front(x);}
+ 	void RemoveHead() {this->pop_front();}
+ 	void RemoveTail() {this->pop_back();}
+ 	void RemoveAll() {this->clear();}
+@@ -131,7 +131,7 @@ public:
+ 	TYPE& GetPrev(iterator& pos) { return *pos--;}
+ 	TYPE GetPrev(iterator& pos) const{ return *pos--;}
+ 	iterator Find(TYPE& x) { return std::find(this->begin(), this->end(), x);}
+-	void RemoveAt(iterator& pos) { erase(pos);}
++	void RemoveAt(iterator& pos) { this->erase(pos);}
+ 	bool IteratorValid(const_iterator &iter) const
+ 	{
+ 		return iter != this->end();
+@@ -167,11 +167,11 @@ public:
+ 	typedef typename  std::map<KEY,VALUE, std::less<KEY>, std::allocator<std::pair<const KEY, VALUE> > >::value_type v_type;
+ 	void SetAt( KEY key, VALUE newValue)
+ 	{
+-		insert(v_type(key, newValue));
++		this->insert(v_type(key, newValue));
+ 	}
+ 	ZBOOL RemoveKey( KEY key )
+ 	{
+-		return erase(key) != 0;
++		return this->erase(key) != 0;
+ 	}
+ 	ZBOOL Lookup( KEY key, VALUE& rValue ) const
+ 	{
+diff --git a/zip/ZipArchive/stdafx.h b/zip/ZipArchive/stdafx.h
+index 9d96081..db54a41 100644
+--- a/zip/ZipArchive/stdafx.h
++++ b/zip/ZipArchive/stdafx.h
+@@ -67,7 +67,7 @@
+ 	#define ZIP_SIZE_TYPE DWORD
+ 	#define ZIP_ZLIB_TYPE int
+ 
+-#if !defined(_INTPTR_T_DEFINED) && !defined(__GNUC__)
++#if !defined(_INTPTR_T_DEFINED)
+ 	#if defined (__BORLANDC__)
+ 		#include <stdint.h>
+ 	#elif _MSC_VER <= 1200 || !defined _MSC_VER
+--
+cgit v0.9.0.2


More information about the arch-commits mailing list