Merge lp:~kalikiana/midori/portablePenguin into lp:midori

[Cris Dywan]

Add deb2portable script and add compatibility compiler flags

Unmerged revisions

6522. By Cris Dywan on 2013-12-17

 Add deb2portable script and add compatibility compiler flags

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-28 17:46:14 +0000
+++ CMakeLists.txt	2013-12-17 23:56:28 +0000
@@ -265,6 +265,10 @@
 
 set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core")
 
+set(PORTABLE_CFLAGS "-Wl,--as-needed -static-libgcc -Wl,--hash-style=both -fno-stack-protector -U_FORTIFY_SOURCE")
+set(CFLAGS "${CFLAGS} ${PORTABLE_CFLAGS}")
+set(VALA_CFLAGS "${VALA_CFLAGS} ${PORTABLE_CFLAGS}")
+
 # CMake provides no uninstall target by design
 add_custom_target (uninstall
     COMMAND "xargs" "rm" "-v" "<" "install_manifest.txt")

=== added file 'tools/deb2portable'
--- tools/deb2portable	1970-01-01 00:00:00 +0000
+++ tools/deb2portable	2013-12-17 23:56:28 +0000
@@ -0,0 +1,25 @@
+#! /bin/sh
+
+# Copyright (C) 2013 Christian Dywan <[e-mail]>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# See the file COPYING for the full license text.
+
+FILE=$1
+if [ ! $1 ]; then
+    echo Usage: $(basename $0) FILENAME
+    echo '  Extracts the specified .deb into a folder and adds a launch script.'
+    exit 1
+fi
+DEST=$PWD/$(echo $FILE | sed 's@.deb@@g')
+mkdir -p "$DEST" || exit 1
+ar p "$FILE" data.tar.gz | tar xz -C $DEST || exit 1
+EXE="$DEST/usr/bin/midori"
+mv $EXE "$EXE.bin" || exit 1
+echo "#! /bin/sh" > "$EXE" || exit 1
+echo "env LD_LIBRARY_PATH=../lib TEXTDOMAINDIR=../share/locale ./midori.bin \$*" >> "$EXE" || exit 1
+chmod +x $EXE || exit 1