app-misc/atol: Fix deps for gnome3, Fix for gcc4.5/6

svn path=/sunrise/; revision=11958

diff --git a/app-misc/atol/ChangeLog b/app-misc/atol/ChangeLog
index f7e0663dfab1b8f23c12a86760c08591ac84fbdb..1ccd53bcb5410e255454af527ba2d08c51ae87b3 100644 (file)
--- a/app-misc/atol/ChangeLog
+++ b/app-misc/atol/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-misc/atol
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> atol-0.7.3.ebuild,
+  files/atol-0.7.3-CFLAGS.patch, +files/atol-0.7.3-gcc46.patch:
+  Fix deps for gnome3, Fix for gcc4.5/6
+
   28 Dec 2006; Raul Porcel (armin76) <armin76@gmail.com> atol-0.7.3.ebuild:
   add multilib
 

diff --git a/app-misc/atol/Manifest b/app-misc/atol/Manifest
index 08c3870fd86bd959e94088d9debf948a27911402..940141c1b5603f2c082faf10a5939b0b83ee7e29 100644 (file)
--- a/app-misc/atol/Manifest
+++ b/app-misc/atol/Manifest
@@ -1,5 +1,6 @@
-AUX atol-0.7.3-CFLAGS.patch 5039 RMD160 9a1ef37fbb863eb22cd05574db9a2ce20dcd632c SHA1 a96ac5c375333033593100d2cf6753d5b1322833 SHA256 1dd1492105c60c878cf0967a7b11f393222ed2a687854594532604b98a017a52
+AUX atol-0.7.3-CFLAGS.patch 6290 RMD160 3bb750ec93fbbc68f67eff52a9e3e511333bb89a SHA1 8bc2fbcfec11918129a963a4396e5208aa6639ed SHA256 9b58db5dfd2b7fb3ff4c6e63cd5444b4fafb632b2ff4938a125b9ac88ada4f44
+AUX atol-0.7.3-gcc46.patch 19064 RMD160 349d033bb886364fff07d1f2dd7b90b872c5a62b SHA1 b9abe5a1a7a0600252f351313c6f0db5b2483bed SHA256 6441522c0be38765ebd53606424e267e4b0b03640dabc398d41c240e2363fd05
 DIST atol-0.7.3_src.tar.gz 1715962 RMD160 e3cc319bbd67b01518adeda41f4b68c67239103f SHA1 4b4463c98ebcc6ccecae2ce9b3044e50cddec95f SHA256 0eab44c12f1a0d00eed45e4e6958c0649c08600993ec453cc0f9b7714109ea37
-EBUILD atol-0.7.3.ebuild 1038 RMD160 96bb63487afafcd9ca56f369b8bbd586e934ec11 SHA1 3752c268fa57e679f1aea8028b88f151537d9df3 SHA256 3df1f8e804aec8b00ed7d58bde8de2d7babfe0183cd51d41f7836adb0d30b012
-MISC ChangeLog 480 RMD160 66afc7bda1f77183912c20f929888e008dcd7ed6 SHA1 ccd8f8f3cbcab3106ddc38819eae80a85366a941 SHA256 d13caa959e7abe475181214a1ce0ecafc6ea68d702c31673940fd264efc3c48f
+EBUILD atol-0.7.3.ebuild 984 RMD160 45be4211045d08b89d1e9e7a5f32ed786d6e34a6 SHA1 7a5b5ccff102cda5e8ed85811ebad8f5be4070bc SHA256 6b4055a8547a1c43f5a72c12dd1da9c46d07d7e8137f9add945cf4e9b7b59548
+MISC ChangeLog 651 RMD160 4ad55bb16c8b2586ea4227cfd6d872c70c4aac2f SHA1 493732bcbb5d472a38af8fe18dd12c02c7c464a4 SHA256 fac76538005631c368ab1c475cf816f095c10a31fbcf49e524146c69fe4a99a1
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/app-misc/atol/atol-0.7.3.ebuild b/app-misc/atol/atol-0.7.3.ebuild
index 243b6c608a47240fd9cc8f019c63d1fca34ac0e6..45ec83652fc400511e46c501092d0c05b2636248 100644 (file)
--- a/app-misc/atol/atol-0.7.3.ebuild
+++ b/app-misc/atol/atol-0.7.3.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="4"
+
 inherit eutils multilib
 
 DESCRIPTION="File manager written using GTK+ and C++"
@@ -13,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
-RDEPEND=">=x11-libs/gtk+-2.6"
+RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
        #test? ( dev-util/valgrind )"
@@ -23,12 +25,13 @@ MAKEOPTS="${MAKEOPTS} -j1"
 # test doesn't work
 RESTRICT="test"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+DOCS="readme.txt"
 
-       # Respect CFLAGS and don't use --as-needed by default
-       epatch "${FILESDIR}/${P}-CFLAGS.patch"
+src_prepare() {
+       edos2unix $(find -type f)
+       epatch \
+               "${FILESDIR}/${P}-CFLAGS.patch" \
+               "${FILESDIR}/${P}-gcc46.patch"
 
        # Fix multilib
        sed -i -e "s#/lib/#/$(get_libdir)/#" "${S}/Makefile" \
@@ -39,9 +42,6 @@ src_unpack() {
                sed -i -e 's/HAVE_GNOME_VFS=1/#HAVE_GNOME_VFS=1/g' Makefile || \
                        die "gnome sed failed"
        fi
-}
 
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-       dodoc readme.txt
+       export CFLAGS="${CXXFLAGS}"
 }

diff --git a/app-misc/atol/files/atol-0.7.3-CFLAGS.patch b/app-misc/atol/files/atol-0.7.3-CFLAGS.patch
index b5d40f2ddb092a1a6f7299f64ba73515bc4f9012..4aa817d37d02bd751ff9da5f96eff3500a6bbd4d 100644 (file)
--- a/app-misc/atol/files/atol-0.7.3-CFLAGS.patch
+++ b/app-misc/atol/files/atol-0.7.3-CFLAGS.patch
@@ -1,7 +1,22 @@
---- Makefile.old       2006-12-27 20:03:49.000000000 +0100
-+++ Makefile   2006-12-27 20:06:00.000000000 +0100
-@@ -15,7 +15,7 @@
- archive=atol-$(VERSION)_src\r
+ Makefile                                    |    8 ++++----
+ plugins/src/ArjLib/Makefile                 |    6 +++---
+ plugins/src/Bz2Lib/Makefile                 |    6 +++---
+ plugins/src/GzLib/Makefile                  |    6 +++---
+ plugins/src/GzLib/zlib/Makefile             |    2 +-
+ plugins/src/LstLib/Makefile                 |    6 +++---
+ plugins/src/TarLib/Makefile                 |    6 +++---
+ plugins/src/ZLib/Makefile                   |    6 +++---
+ plugins/src/ZipLib/Makefile                 |    8 ++++----
+ plugins/src/ZipLib/ZipArchive/Makefile      |    2 +-
+ plugins/src/ZipLib/ZipArchive/zlib/Makefile |    2 +-
+ 11 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1fe9736..088b587 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ topdir=/usr/src/redhat
+ archive=atol-$(VERSION)_src
  
  #define plugin install path
 -plugin_dir=$(DESTDIR)$(prefix)/local/lib/atol
@@ -9,16 +24,18 @@
  #comment this to remove gnome-vfs support
  HAVE_GNOME_VFS=1
  
-@@ -32,7 +32,7 @@
+@@ -31,8 +31,8 @@ HAVE_GNOME_VFS=1
+ 
  #DEBUG=-g -D_DEBUG
  
- CXX=g++ 
+-CXX=g++ 
 -CFLAGS=-Wall 
++CXX ?=g++ 
 +CFLAGS+=-Wall 
  FLAGS=$(CFLAGS)
  BIN=./bin
  OBJ=./bin
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ LOPTIMIZE=-Os -Wl,--as-needed
  
  # define compile/link command line with flags
  CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -pthread -DENABLE_NLS
@@ -27,13 +44,17 @@
  
  LIBS=gtk+-2.0 gdk-2.0 glib-2.0 gthread-2.0 libssl
  ifdef HAVE_GNOME_VFS
---- plugins/src/ArjLib/Makefile.old    2006-12-27 20:42:47.000000000 +0100
-+++ plugins/src/ArjLib/Makefile        2006-12-27 20:48:51.000000000 +0100
-@@ -13,11 +13,11 @@
+diff --git a/plugins/src/ArjLib/Makefile b/plugins/src/ArjLib/Makefile
+index c8f4c9c..9d45b10 100644
+--- a/plugins/src/ArjLib/Makefile
++++ b/plugins/src/ArjLib/Makefile
+@@ -12,12 +12,12 @@
+ #
  
  #DEBUG=-g
- CXX=gcc
+-CXX=gcc
 -CFLAGS= -I ../
++CXX ?=g++
 +CFLAGS+= -I ../
  FLAGS= $(CFLAGS)
  
@@ -43,13 +64,17 @@
  LD=$(CXX) $(DEBUG) -fPIC
  
  #
---- plugins/src/Bz2Lib/Makefile.old    2006-12-27 20:43:02.000000000 +0100
-+++ plugins/src/Bz2Lib/Makefile        2006-12-27 20:49:11.000000000 +0100
-@@ -13,11 +13,11 @@
+diff --git a/plugins/src/Bz2Lib/Makefile b/plugins/src/Bz2Lib/Makefile
+index 5cccce4..c794912 100644
+--- a/plugins/src/Bz2Lib/Makefile
++++ b/plugins/src/Bz2Lib/Makefile
+@@ -12,12 +12,12 @@
+ #
  
  #DEBUG=-g
- CXX=gcc
+-CXX=gcc
 -CFLAGS= -I ../
++CXX ?=g++
 +CFLAGS+= -I ../
  FLAGS= $(CFLAGS)
  
@@ -59,13 +84,17 @@
  LD=$(CXX) $(DEBUG) -fPIC
  
  #
---- plugins/src/GzLib/Makefile.old     2006-12-27 20:43:12.000000000 +0100
-+++ plugins/src/GzLib/Makefile 2006-12-27 20:49:27.000000000 +0100
-@@ -13,11 +13,11 @@
+diff --git a/plugins/src/GzLib/Makefile b/plugins/src/GzLib/Makefile
+index 92d9216..1e8eb28 100644
+--- a/plugins/src/GzLib/Makefile
++++ b/plugins/src/GzLib/Makefile
+@@ -12,12 +12,12 @@
+ #
  
  #DEBUG=-g
- CXX=gcc
+-CXX=gcc
 -CFLAGS= -I ../
++CXX ?=g++
 +CFLAGS+= -I ../
  FLAGS= $(CFLAGS)
  
@@ -75,13 +104,30 @@
  LD=$(CXX) $(DEBUG) -fPIC
  
  #
---- plugins/src/LstLib/Makefile.old    2006-12-27 20:43:18.000000000 +0100
-+++ plugins/src/LstLib/Makefile        2006-12-27 20:49:44.000000000 +0100
-@@ -13,11 +13,11 @@
+diff --git a/plugins/src/GzLib/zlib/Makefile b/plugins/src/GzLib/zlib/Makefile
+index 9fe7751..add1461 100644
+--- a/plugins/src/GzLib/zlib/Makefile
++++ b/plugins/src/GzLib/zlib/Makefile
+@@ -8,7 +8,7 @@
+ 
+ CC=cc
+ 
+-CFLAGS=-O -fPIC 
++CFLAGS+=-O -fPIC 
+ #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+ #CFLAGS=-g -DDEBUG
+ #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+diff --git a/plugins/src/LstLib/Makefile b/plugins/src/LstLib/Makefile
+index b951beb..ee19c23 100644
+--- a/plugins/src/LstLib/Makefile
++++ b/plugins/src/LstLib/Makefile
+@@ -12,12 +12,12 @@
+ #
  
  #DEBUG=-g
- CXX=gcc
+-CXX=gcc
 -CFLAGS= -I ../
++CXX ?=g++
 +CFLAGS+= -I ../
  FLAGS= $(CFLAGS)
  
@@ -91,13 +137,17 @@
  LD=$(CXX) $(DEBUG) -fPIC
  
  #
---- plugins/src/TarLib/Makefile.old    2006-12-27 20:44:04.000000000 +0100
-+++ plugins/src/TarLib/Makefile        2006-12-27 20:50:16.000000000 +0100
-@@ -13,11 +13,11 @@
+diff --git a/plugins/src/TarLib/Makefile b/plugins/src/TarLib/Makefile
+index 7b142d8..425c915 100644
+--- a/plugins/src/TarLib/Makefile
++++ b/plugins/src/TarLib/Makefile
+@@ -12,12 +12,12 @@
+ #
  
  #DEBUG=-g
- CXX=gcc
+-CXX=gcc
 -CFLAGS= -I ../
++CXX ?=g++
 +CFLAGS+= -I ../
  FLAGS= $(CFLAGS)
  
@@ -107,13 +157,17 @@
  LD=$(CXX) $(DEBUG) -fPIC
  
  #
---- plugins/src/ZLib/Makefile.old      2006-12-27 20:44:15.000000000 +0100
-+++ plugins/src/ZLib/Makefile  2006-12-27 20:50:31.000000000 +0100
-@@ -13,11 +13,11 @@
+diff --git a/plugins/src/ZLib/Makefile b/plugins/src/ZLib/Makefile
+index ceed8d5..d9751ee 100644
+--- a/plugins/src/ZLib/Makefile
++++ b/plugins/src/ZLib/Makefile
+@@ -12,12 +12,12 @@
+ #
  
  #DEBUG=-g
- CXX=gcc
+-CXX=gcc
 -CFLAGS= -I ../
++CXX ?=g++
 +CFLAGS+= -I ../
  FLAGS= $(CFLAGS)
  
@@ -123,13 +177,19 @@
  LD=$(CXX) $(DEBUG) -fPIC
  
  #
---- plugins/src/ZipLib/Makefile.old    2006-12-27 20:08:32.000000000 +0100
-+++ plugins/src/ZipLib/Makefile        2006-12-27 20:08:54.000000000 +0100
-@@ -15,14 +15,14 @@
+diff --git a/plugins/src/ZipLib/Makefile b/plugins/src/ZipLib/Makefile
+index 0b488ed..82690ed 100644
+--- a/plugins/src/ZipLib/Makefile
++++ b/plugins/src/ZipLib/Makefile
+@@ -13,16 +13,16 @@
+ 
+ #DEBUG=-g -D_DEBUG
  #compiler compatible to ZipArchive!
- #CXX=g++
- CXX=gcc
+-#CXX=g++
+-CXX=gcc
 -CFLAGS= -I../ -I./ZipArchive/stl -I./ZipArchive/Linux -I./ZipArchive/
++#CXX ?=g++
++CXX ?=g++
 +CFLAGS+= -I../ -I./ZipArchive/stl -I./ZipArchive/Linux -I./ZipArchive/
  FLAGS= $(CFLAGS)
  
@@ -142,36 +202,29 @@
  LD=$(CXX) $(DEBUG) -fPIC
  
  #
---- plugins/src/ZipLib/ZipArchive/Makefile.old 2006-12-27 21:28:56.000000000 +0100
-+++ plugins/src/ZipLib/ZipArchive/Makefile     2006-12-27 21:29:20.000000000 +0100
-@@ -11,7 +11,7 @@
- CCC=cc\r
- \r
- #CFLAGS = -g\r
--CFLAGS=-fPIC \r
-+CFLAGS+=-fPIC \r
- \r
- ZIPARCHLIB = libziparch.a\r
- \r
---- plugins/src/ZipLib/ZipArchive/zlib/Makefile.old    2006-12-27 21:30:55.000000000 +0100
-+++ plugins/src/ZipLib/ZipArchive/zlib/Makefile        2006-12-27 21:31:24.000000000 +0100
+diff --git a/plugins/src/ZipLib/ZipArchive/Makefile b/plugins/src/ZipLib/ZipArchive/Makefile
+index 4cf0d3f..49139aa 100644
+--- a/plugins/src/ZipLib/ZipArchive/Makefile
++++ b/plugins/src/ZipLib/ZipArchive/Makefile
+@@ -11,7 +11,7 @@ CC=g++ -I./stl -I./Linux
+ CCC=cc
+ 
+ #CFLAGS = -g
+-CFLAGS=-fPIC 
++CFLAGS+=-fPIC 
+ 
+ ZIPARCHLIB = libziparch.a
+ 
+diff --git a/plugins/src/ZipLib/ZipArchive/zlib/Makefile b/plugins/src/ZipLib/ZipArchive/zlib/Makefile
+index dc9b836..04ca23f 100644
+--- a/plugins/src/ZipLib/ZipArchive/zlib/Makefile
++++ b/plugins/src/ZipLib/ZipArchive/zlib/Makefile
 @@ -8,7 +8,7 @@
- \r
- CC=cc\r
- \r
--CFLAGS=-O -fPIC\r
-+CFLAGS+=-fPIC\r
- #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7\r
- #CFLAGS=-g -DDEBUG\r
- #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \\r
---- plugins/src/GzLib/zlib/Makefile.old        2006-12-27 21:32:44.000000000 +0100
-+++ plugins/src/GzLib/zlib/Makefile    2006-12-27 21:33:15.000000000 +0100
-@@ -8,7 +8,7 @@
- \r
- CC=cc\r
- \r
--CFLAGS=-O -fPIC \r
-+CFLAGS+=-fPIC \r
- #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7\r
- #CFLAGS=-g -DDEBUG\r
- #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \\r
+ 
+ CC=cc
+ 
+-CFLAGS=-O -fPIC
++CFLAGS+=-O -fPIC
+ #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+ #CFLAGS=-g -DDEBUG
+ #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \

diff --git a/app-misc/atol/files/atol-0.7.3-gcc46.patch b/app-misc/atol/files/atol-0.7.3-gcc46.patch
new file mode 100644 (file)
index 0000000..cd35c43
--- /dev/null
+++ b/app-misc/atol/files/atol-0.7.3-gcc46.patch
@@ -0,0 +1,601 @@
+ plugins/src/ArjLib/ArjLib.cpp                   |    1 +
+ plugins/src/ArjLib/Makefile                     |    2 +-
+ plugins/src/Bz2Lib/Bz2Lib.cpp                   |    2 ++
+ plugins/src/Bz2Lib/Makefile                     |    2 +-
+ plugins/src/Bz2Lib/bz2.cpp                      |    1 +
+ plugins/src/GzLib/GzLib.cpp                     |    1 +
+ plugins/src/GzLib/Makefile                      |    2 +-
+ plugins/src/GzLib/gzip.cpp                      |    1 +
+ plugins/src/LstLib/EntryTree.h                  |    1 +
+ plugins/src/LstLib/Makefile                     |    2 +-
+ plugins/src/TarLib/LibTar.cpp                   |    3 +++
+ plugins/src/TarLib/Makefile                     |    2 +-
+ plugins/src/TarLib/TarLib.cpp                   |    2 ++
+ plugins/src/ZLib/Makefile                       |    2 +-
+ plugins/src/ZLib/ZLib.cpp                       |    2 ++
+ plugins/src/ZipLib/Makefile                     |    2 +-
+ plugins/src/ZipLib/ZipArchive/ZipArchive.cpp    |    3 +++
+ plugins/src/ZipLib/ZipArchive/ZipFileHeader.cpp |    2 ++
+ plugins/src/ZipLib/ZipArchive/stl/ZipString.h   |    1 +
+ src/FileSearchDlg.cpp                           |    2 ++
+ src/MainWindow.cpp                              |    2 ++
+ src/OptionsDialog.cpp                           |    1 +
+ src/PackFilesDlg.cpp                            |    1 +
+ src/SiteManagerDlg.cpp                          |    2 ++
+ src/core/ConnectionInfo.h                       |    1 +
+ src/core/ConnectionInfoList.cpp                 |    2 ++
+ src/core/GuiLanguage.cpp                        |    2 ++
+ src/core/OpDecrypt.cpp                          |    1 +
+ src/core/OpEncrypt.cpp                          |    2 ++
+ src/core/PathName.cpp                           |    2 ++
+ src/core/PluginManager.cpp                      |    1 +
+ src/core/ProxyFtp.cpp                           |    1 +
+ src/core/ProxySocks.cpp                         |    2 ++
+ src/core/String.cpp                             |    2 ++
+ src/core/System.cpp                             |    4 +++-
+ src/core/VfsListing.cpp                         |    1 +
+ src/core/_ftp/FtpListParser.cpp                 |    2 ++
+ src/core/_ftp/xSSLContext.cpp                   |    2 +-
+ src/core/_ftp/xSocket.cpp                       |    2 ++
+ src/core/_unx/SystemImpl.cpp                    |    2 ++
+ src/core/_util/Base64.cpp                       |    1 +
+ src/core/util.cpp                               |    2 ++
+ src/main.cpp                                    |    2 ++
+ 43 files changed, 67 insertions(+), 9 deletions(-)
+
+diff --git a/plugins/src/ArjLib/ArjLib.cpp b/plugins/src/ArjLib/ArjLib.cpp
+index 59262f1..2cce523 100644
+--- a/plugins/src/ArjLib/ArjLib.cpp
++++ b/plugins/src/ArjLib/ArjLib.cpp
+@@ -12,6 +12,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <time.h>
++#include <cstring>
+ 
+ #ifndef _WIN32
+  #include <ctype.h>
+diff --git a/plugins/src/ArjLib/Makefile b/plugins/src/ArjLib/Makefile
+index c8f4c9c..c1a2b40 100644
+--- a/plugins/src/ArjLib/Makefile
++++ b/plugins/src/ArjLib/Makefile
+@@ -38,7 +38,7 @@ OBJS= ArjLib.o ArchiveInfo.o ArjUnpack.o unarj.o environ.o decode.o
+ # link program binary
+ # mark symbols with dllexport in source, or try -Wl,--export-all
+ arjlib: $(OBJS)
+-      $(LD) $(OBJS) -o ArjLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic --export-all --enable-auto-import
++      $(LD) $(OBJS) -o ArjLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic
+ 
+ # compile individual objects
+ # TOFIX?: use pattern rules (how to adjust for possible multiple source directories?)
+diff --git a/plugins/src/Bz2Lib/Bz2Lib.cpp b/plugins/src/Bz2Lib/Bz2Lib.cpp
+index e731842..7248170 100644
+--- a/plugins/src/Bz2Lib/Bz2Lib.cpp
++++ b/plugins/src/Bz2Lib/Bz2Lib.cpp
+@@ -8,6 +8,8 @@
+ #include <time.h>
+ #include "../plugin_int.h"
+ 
++#include <cstring>
++
+ #ifndef _WIN32
+  #include <ctype.h>
+ #endif
+diff --git a/plugins/src/Bz2Lib/Makefile b/plugins/src/Bz2Lib/Makefile
+index 5cccce4..08d9e3b 100644
+--- a/plugins/src/Bz2Lib/Makefile
++++ b/plugins/src/Bz2Lib/Makefile
+@@ -39,7 +39,7 @@ OBJS= Bz2Lib.o ArchiveInfo.o bz2.o $(BZ2SRC)/libbz2.a
+ # link program binary
+ # mark symbols with dllexport in source, or try -Wl,--export-all
+ bzlib: $(OBJS)
+-      $(LD) $(OBJS) -o Bz2Lib.atp $(FLAGS) $(LDFLAGS) -shared -fpic --export-all --enable-auto-import
++      $(LD) $(OBJS) -o Bz2Lib.atp $(FLAGS) $(LDFLAGS) -shared -fpic
+ 
+ # compile individual objects
+ # TOFIX?: use pattern rules (how to adjust for possible multiple source directories?)
+diff --git a/plugins/src/Bz2Lib/bz2.cpp b/plugins/src/Bz2Lib/bz2.cpp
+index b361a3d..a481c4b 100644
+--- a/plugins/src/Bz2Lib/bz2.cpp
++++ b/plugins/src/Bz2Lib/bz2.cpp
+@@ -7,6 +7,7 @@
+ ////////////////////////////////////////////////////////////////////////////
+ 
+ #include "bz2.h"
++#include <cstring>
+ 
+ CBZ2::CBZ2()
+ {
+diff --git a/plugins/src/GzLib/GzLib.cpp b/plugins/src/GzLib/GzLib.cpp
+index cb53b75..96a5d31 100644
+--- a/plugins/src/GzLib/GzLib.cpp
++++ b/plugins/src/GzLib/GzLib.cpp
+@@ -14,6 +14,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ #include "zlib/zlib.h"
++#include <cstring>
+ 
+ #ifdef _WIN32
+  #include <windows.h>
+diff --git a/plugins/src/GzLib/Makefile b/plugins/src/GzLib/Makefile
+index 92d9216..e4cc5d2 100644
+--- a/plugins/src/GzLib/Makefile
++++ b/plugins/src/GzLib/Makefile
+@@ -39,7 +39,7 @@ OBJS= GzLib.o ArchiveInfo.o gzip.o $(ZLIBSRC)/libz.a
+ # link program binary
+ # mark symbols with dllexport in source, or try -Wl,--export-all
+ gzlib: $(OBJS)
+-      $(LD) $(OBJS) -o GzLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic --export-all --enable-auto-import
++      $(LD) $(OBJS) -o GzLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic
+ 
+ # compile individual objects
+ # TOFIX?: use pattern rules (how to adjust for possible multiple source directories?)
+diff --git a/plugins/src/GzLib/gzip.cpp b/plugins/src/GzLib/gzip.cpp
+index 9f253bf..e48c38e 100644
+--- a/plugins/src/GzLib/gzip.cpp
++++ b/plugins/src/GzLib/gzip.cpp
+@@ -38,6 +38,7 @@
+ #include "gzip.h"
+ #include <limits.h>
+ #include <time.h>
++#include <cstring>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
+diff --git a/plugins/src/LstLib/EntryTree.h b/plugins/src/LstLib/EntryTree.h
+index cd2a1d9..0ca588f 100644
+--- a/plugins/src/LstLib/EntryTree.h
++++ b/plugins/src/LstLib/EntryTree.h
+@@ -14,6 +14,7 @@
+ #endif // _MSC_VER > 1000
+ 
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <algorithm>
+ 
+diff --git a/plugins/src/LstLib/Makefile b/plugins/src/LstLib/Makefile
+index b951beb..7fe12eb 100644
+--- a/plugins/src/LstLib/Makefile
++++ b/plugins/src/LstLib/Makefile
+@@ -38,7 +38,7 @@ OBJS= EntryTree.o LstCatalog.o ArchiveInfo.o LstLib.o
+ # link program binary
+ # mark symbols with dllexport in source, or try -Wl,--export-all
+ lstlib: $(OBJS)
+-      $(LD) $(OBJS) -o LstLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic --export-all --enable-auto-import
++      $(LD) $(OBJS) -o LstLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic
+ 
+ # compile individual objects
+ # TOFIX?: use pattern rules (how to adjust for possible multiple source directories?)
+diff --git a/plugins/src/TarLib/LibTar.cpp b/plugins/src/TarLib/LibTar.cpp
+index 186aeca..182f616 100644
+--- a/plugins/src/TarLib/LibTar.cpp
++++ b/plugins/src/TarLib/LibTar.cpp
+@@ -20,6 +20,9 @@
+  #define min(a,b) ((a)<(b))?(a):(b)
+ #endif
+ 
++#include <cstring>
++#include <cstdio>
++
+ static const int RECORDSIZE = 512;
+ static const int NAMSIZ               = 100;
+ static const int TUNMLEN    =  32;
+diff --git a/plugins/src/TarLib/Makefile b/plugins/src/TarLib/Makefile
+index 7b142d8..1c420c0 100644
+--- a/plugins/src/TarLib/Makefile
++++ b/plugins/src/TarLib/Makefile
+@@ -38,7 +38,7 @@ OBJS= TarLib.o ArchiveInfo.o LibTar.o
+ # link program binary
+ # mark symbols with dllexport in source, or try -Wl,--export-all
+ tarlib: $(OBJS)
+-      $(LD) $(OBJS) -o TarLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic --export-all --enable-auto-import
++      $(LD) $(OBJS) -o TarLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic
+ 
+ # compile individual objects
+ # TOFIX?: use pattern rules (how to adjust for possible multiple source directories?)
+diff --git a/plugins/src/TarLib/TarLib.cpp b/plugins/src/TarLib/TarLib.cpp
+index f5474f4..4c2d6e1 100644
+--- a/plugins/src/TarLib/TarLib.cpp
++++ b/plugins/src/TarLib/TarLib.cpp
+@@ -12,6 +12,8 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <time.h>
++#include <cstring>
++#include <cstdio>
+ 
+ #ifndef _WIN32
+  #include <ctype.h>
+diff --git a/plugins/src/ZLib/Makefile b/plugins/src/ZLib/Makefile
+index ceed8d5..518f8ea 100644
+--- a/plugins/src/ZLib/Makefile
++++ b/plugins/src/ZLib/Makefile
+@@ -38,7 +38,7 @@ OBJS= ZLib.o ArchiveInfo.o Decompress.o
+ # link program binary
+ # mark symbols with dllexport in source, or try -Wl,--export-all
+ zlib: $(OBJS)
+-      $(LD) $(OBJS) -o ZLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic --export-all --enable-auto-import
++      $(LD) $(OBJS) -o ZLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic
+ 
+ # compile individual objects
+ # TOFIX?: use pattern rules (how to adjust for possible multiple source directories?)
+diff --git a/plugins/src/ZLib/ZLib.cpp b/plugins/src/ZLib/ZLib.cpp
+index 079adf1..2901815 100644
+--- a/plugins/src/ZLib/ZLib.cpp
++++ b/plugins/src/ZLib/ZLib.cpp
+@@ -12,6 +12,8 @@
+  #include <ctype.h>
+ #endif
+ 
++#include <cstring>
++
+ //global data
+ COpenArchivesList     g_ArchList;
+ tPasswordProc         g_pfnPwdProc = NULL;
+diff --git a/plugins/src/ZipLib/Makefile b/plugins/src/ZipLib/Makefile
+index 0b488ed..6d30c5e 100644
+--- a/plugins/src/ZipLib/Makefile
++++ b/plugins/src/ZipLib/Makefile
+@@ -43,7 +43,7 @@ OBJS= ZipLib.o ArchiveInfo.o ./ZipArchive/libziparch.a
+ # link program binary
+ # mark symbols with dllexport in source, or try -Wl,--export-all
+ ziplib: $(OBJS)
+-      $(LD) $(OBJS) -o ZipLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic --export-all --enable-auto-import
++      $(LD) $(OBJS) -o ZipLib.atp $(FLAGS) $(LDFLAGS) -shared -fpic
+ 
+ # compile individual objects
+ # TOFIX?: use pattern rules (how to adjust for possible multiple source directories?)
+diff --git a/plugins/src/ZipLib/ZipArchive/ZipArchive.cpp b/plugins/src/ZipLib/ZipArchive/ZipArchive.cpp
+index a8758a0..7aa22bd 100644
+--- a/plugins/src/ZipLib/ZipArchive/ZipArchive.cpp
++++ b/plugins/src/ZipLib/ZipArchive/ZipArchive.cpp
+@@ -27,6 +27,9 @@
+ #endif
+ #endif
+ 
++#include <cstring>
++#include <climits>
++
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
+ //////////////////////////////////////////////////////////////////////
+diff --git a/plugins/src/ZipLib/ZipArchive/ZipFileHeader.cpp b/plugins/src/ZipLib/ZipArchive/ZipFileHeader.cpp
+index 38cf4c9..4b48ea6 100644
+--- a/plugins/src/ZipLib/ZipArchive/ZipFileHeader.cpp
++++ b/plugins/src/ZipLib/ZipArchive/ZipFileHeader.cpp
+@@ -22,6 +22,8 @@
+ #define FILEHEADERSIZE        46
+ #define LOCALFILEHEADERSIZE   30
+ 
++#include <climits>
++
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
+ //////////////////////////////////////////////////////////////////////
+diff --git a/plugins/src/ZipLib/ZipArchive/stl/ZipString.h b/plugins/src/ZipLib/ZipArchive/stl/ZipString.h
+index 8ec3996..b9cd8eb 100644
+--- a/plugins/src/ZipLib/ZipArchive/stl/ZipString.h
++++ b/plugins/src/ZipLib/ZipArchive/stl/ZipString.h
+@@ -13,6 +13,7 @@
+ #ifndef __ZIPSTRING_H__
+ #define __ZIPSTRING_H__
+ #include "stdafx.h"
++#include <cstring>
+ 
+ #if defined(_MSC_VER) && (_MSC_VER > 1100) 
+       #pragma warning( push, 3 ) // STL requirements
+diff --git a/src/FileSearchDlg.cpp b/src/FileSearchDlg.cpp
+index 46da6c5..f554529 100644
+--- a/src/FileSearchDlg.cpp
++++ b/src/FileSearchDlg.cpp
+@@ -13,6 +13,8 @@
+ #include "core/IniFile.h"
+ #include "core/debug.h"
+ 
++#include <cstdlib>
++
+ extern GtkWidget *atol_main;
+ extern DualPanel g_dp;
+ 
+diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
+index ebffc91..c7546cc 100644
+--- a/src/MainWindow.cpp
++++ b/src/MainWindow.cpp
+@@ -29,6 +29,8 @@
+ #include "../res/ftp.xpm"
+ #include "../res/close.xpm"
+ 
++#include <cstring>
++
+ extern bool g_bNCSelection;
+ extern bool g_bRefreshPanelsOnFocus;
+ extern bool g_bShowExtColumn;
+diff --git a/src/OptionsDialog.cpp b/src/OptionsDialog.cpp
+index b9ff9ae..51dee77 100644
+--- a/src/OptionsDialog.cpp
++++ b/src/OptionsDialog.cpp
+@@ -12,6 +12,7 @@
+ #include "core/System.h"
+ #include "support.h"
+ #include "DualPanel.h"
++#include <cstring>
+ 
+ #if _MSC_VER > 1000
+  #pragma warning(disable:4786)
+diff --git a/src/PackFilesDlg.cpp b/src/PackFilesDlg.cpp
+index ea08c75..786d0e9 100644
+--- a/src/PackFilesDlg.cpp
++++ b/src/PackFilesDlg.cpp
+@@ -14,6 +14,7 @@
+ #include "core/PathName.h"
+ #include "core/IniFile.h"
+ #include <vector>
++#include <cstring>
+ 
+ extern GtkWidget *atol_main;
+ extern PluginManager g_PlugManager;
+diff --git a/src/SiteManagerDlg.cpp b/src/SiteManagerDlg.cpp
+index 303fa47..a67a545 100644
+--- a/src/SiteManagerDlg.cpp
++++ b/src/SiteManagerDlg.cpp
+@@ -13,6 +13,8 @@
+ #include <gtk/gtk.h>
+ #include "GuiInputDlg.h"
+ 
++#include <cstdlib>
++
+ #ifdef _WIN32
+   #include <io.h>
+   #define access _access
+diff --git a/src/core/ConnectionInfo.h b/src/core/ConnectionInfo.h
+index f2125ae..5876df1 100644
+--- a/src/core/ConnectionInfo.h
++++ b/src/core/ConnectionInfo.h
+@@ -14,6 +14,7 @@
+ #endif // _MSC_VER > 1000
+ 
+ #include "String.h"
++#include <cstring>
+ 
+ class CProxyInfo
+ {
+diff --git a/src/core/ConnectionInfoList.cpp b/src/core/ConnectionInfoList.cpp
+index 4f9f16e..0146045 100644
+--- a/src/core/ConnectionInfoList.cpp
++++ b/src/core/ConnectionInfoList.cpp
+@@ -13,6 +13,8 @@
+   #include <windows.h>
+ #endif
+ 
++#include <cstdio>
++
+ CNodeInfo::CNodeInfo()
+ {
+       m_nID   = -1;
+diff --git a/src/core/GuiLanguage.cpp b/src/core/GuiLanguage.cpp
+index 2daa7b9..098744d 100644
+--- a/src/core/GuiLanguage.cpp
++++ b/src/core/GuiLanguage.cpp
+@@ -22,6 +22,8 @@
+  #include<unistd.h>
+ #endif 
+ 
++#include <cstring>
++
+ extern GuiLanguage g_lang;
+ 
+ bool OnDirEnum(const std::string &dir, void *data);
+diff --git a/src/core/OpDecrypt.cpp b/src/core/OpDecrypt.cpp
+index 50de285..cc159c0 100644
+--- a/src/core/OpDecrypt.cpp
++++ b/src/core/OpDecrypt.cpp
+@@ -11,6 +11,7 @@
+ #include "PathName.h"
+ #include "_crypt/blowfish.h"
+ #include "_crypt/md5.h"
++#include <cstring>
+ 
+ #ifdef _WIN32
+  #include <io.h> //access
+diff --git a/src/core/OpEncrypt.cpp b/src/core/OpEncrypt.cpp
+index 76ea15e..3a577b4 100644
+--- a/src/core/OpEncrypt.cpp
++++ b/src/core/OpEncrypt.cpp
+@@ -12,6 +12,8 @@
+ #include "_crypt/md5.h"
+ #include "PathName.h"
+ 
++#include <cstring>
++
+ #ifdef _WIN32
+  #include <io.h> //access
+ #else
+diff --git a/src/core/PathName.cpp b/src/core/PathName.cpp
+index 93f54de..6a1bc83 100644
+--- a/src/core/PathName.cpp
++++ b/src/core/PathName.cpp
+@@ -13,6 +13,8 @@
+ #include <glib/gprintf.h>
+ #include "debug.h"
+ 
++#include <cstring>
++
+ PathName::PathName()
+ {
+ }
+diff --git a/src/core/PluginManager.cpp b/src/core/PluginManager.cpp
+index a40452f..2676094 100644
+--- a/src/core/PluginManager.cpp
++++ b/src/core/PluginManager.cpp
+@@ -11,6 +11,7 @@
+ #include "System.h"
+ #include "util.h"
+ #include "debug.h"
++#include <cstring>
+ 
+ //NOTE: unique plugin file extension ".atp"
+ #define PLUGIN_EXT ".atp"
+diff --git a/src/core/ProxyFtp.cpp b/src/core/ProxyFtp.cpp
+index f27fd90..cebedb9 100644
+--- a/src/core/ProxyFtp.cpp
++++ b/src/core/ProxyFtp.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include "ProxyFtp.h"
+ #include "_ftp/xSocket.h"
++#include <cstring>
+ 
+ CProxyFtp::CProxyFtp()
+ {
+diff --git a/src/core/ProxySocks.cpp b/src/core/ProxySocks.cpp
+index 25ddc7a..e21941c 100644
+--- a/src/core/ProxySocks.cpp
++++ b/src/core/ProxySocks.cpp
+@@ -20,6 +20,8 @@
+  #include <netdb.h>
+ #endif
+ 
++#include <cstring>
++
+ #define  UC(b)        (((int)b)&0xff)
+ 
+ CProxySocks::CProxySocks()
+diff --git a/src/core/String.cpp b/src/core/String.cpp
+index 4714c29..4541de8 100644
+--- a/src/core/String.cpp
++++ b/src/core/String.cpp
+@@ -17,6 +17,8 @@
+  #include <ctype.h>
+ #endif
+ 
++#include <cstring>
++
+ String::String()
+ {
+ }
+diff --git a/src/core/System.cpp b/src/core/System.cpp
+index c346c36..3ad384f 100644
+--- a/src/core/System.cpp
++++ b/src/core/System.cpp
+@@ -11,6 +11,8 @@
+ #include "debug.h"
+ #include "PathName.h"
+ 
++#include <cstring>
++
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <direct.h> //_mkdir
+@@ -288,7 +290,7 @@ void System::GetPartitionList(std::vector<std::string> &lstPartitions)
+ 
+       //break result into the set of lines
+       const char *szStart = strOutput.c_str();
+-      char *szPos = NULL;
++      const char *szPos = NULL;
+       int nLine = 0;
+       while(NULL != (szPos = strchr(szStart, '\n')))
+       {
+diff --git a/src/core/VfsListing.cpp b/src/core/VfsListing.cpp
+index 4fead72..eab7cf9 100644
+--- a/src/core/VfsListing.cpp
++++ b/src/core/VfsListing.cpp
+@@ -9,6 +9,7 @@
+ #include "VfsListing.h"
+ #include "util.h"
+ #include <algorithm>    //sort
++#include <cstring>
+ 
+ //TOFIX move to VfsItem with enum
+ //used to sort VfsListing class
+diff --git a/src/core/_ftp/FtpListParser.cpp b/src/core/_ftp/FtpListParser.cpp
+index 3b104e7..9e6935d 100644
+--- a/src/core/_ftp/FtpListParser.cpp
++++ b/src/core/_ftp/FtpListParser.cpp
+@@ -9,6 +9,8 @@
+ #include "FtpListParser.h"
+ #include <time.h>
+ #include <ctype.h>
++#include <cstring>
++#include <cstdlib>
+ #ifndef _WIN32
+  #include <strings.h> //Linux strncasecmp
+ #endif
+diff --git a/src/core/_ftp/xSSLContext.cpp b/src/core/_ftp/xSSLContext.cpp
+index 41a602e..4b6a277 100644
+--- a/src/core/_ftp/xSSLContext.cpp
++++ b/src/core/_ftp/xSSLContext.cpp
+@@ -26,7 +26,7 @@ bool xSSLContext::Create(CFtpInfo::FtpEncryptionType nMethod)
+       Destroy();      // just in case
+ 
+       //create SSL context using selected protocol type
+-      SSL_METHOD *meth = NULL;
++      const SSL_METHOD *meth = NULL;
+ 
+       switch(nMethod){
+               case CFtpInfo::ENCRYPT_SSLv3:
+diff --git a/src/core/_ftp/xSocket.cpp b/src/core/_ftp/xSocket.cpp
+index b241f14..57df251 100644
+--- a/src/core/_ftp/xSocket.cpp
++++ b/src/core/_ftp/xSocket.cpp
+@@ -34,6 +34,8 @@
+   #include <sys/ioctl.h>
+ #endif
+ 
++#include <cstring>
++
+ xSocket::xSocket()
+ {
+       m_hSocket = INVALID_SOCKET;
+diff --git a/src/core/_unx/SystemImpl.cpp b/src/core/_unx/SystemImpl.cpp
+index b66b9cb..7951268 100644
+--- a/src/core/_unx/SystemImpl.cpp
++++ b/src/core/_unx/SystemImpl.cpp
+@@ -30,6 +30,8 @@
+ #include "../debug.h"
+ #include "../util.h"
+ 
++#include <cstring>
++
+ #if defined(HAVE_GNOME_VFS)
+ 
+ // Namespace for Gnome VFS wrappers.
+diff --git a/src/core/_util/Base64.cpp b/src/core/_util/Base64.cpp
+index 8ee60ad..f16e0b0 100644
+--- a/src/core/_util/Base64.cpp
++++ b/src/core/_util/Base64.cpp
+@@ -11,6 +11,7 @@
+ 
+ #include "Base64.h"
+ #include "../debug.h"
++#include <cstring>
+ 
+ // Static Member Initializers
+ //
+diff --git a/src/core/util.cpp b/src/core/util.cpp
+index 61caeeb..0e86725 100644
+--- a/src/core/util.cpp
++++ b/src/core/util.cpp
+@@ -23,6 +23,8 @@
+   #include <ctype.h>
+ #endif
+ 
++#include <cstring>
++
+ extern String g_strTerminal;
+ int gtkMessageBox(const char *szText, int nButtons = GTK_BUTTONS_OK, int nIcon = GTK_MESSAGE_INFO);
+ 
+diff --git a/src/main.cpp b/src/main.cpp
+index 988be0b..b205c3b 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -21,6 +21,8 @@
+ #include "core/PathName.h"
+ #include "core/System.h"
+ 
++#include <cstring>
++
+ #ifdef _WIN32
+  #include "core/_win/SingleInstance.h"
+  CSingleInstance g_instance("Atol");