Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 64 insertions, 0 deletions

diff --git a/libre/icecat/remove-google-play-services-support.patch b/libre/icecat/remove-google-play-services-support.patch
new file mode 100644
index 000000000..f184b15ad
--- /dev/null
+++ b/libre/icecat/remove-google-play-services-support.patch
@@ -0,0 +1,64 @@
+diff -Nur a/configure b/configure
+--- a/configure	2015-08-23 17:05:16.000000000 -0300
++++ b/configure	2015-08-25 17:13:48.155780403 -0300
+@@ -18883,46 +18883,6 @@
+ 
+ 
+ 
+-if test -n "$MOZ_NATIVE_DEVICES" ; then
+-    
+-
+-    echo $ac_n "checking for google play services""... $ac_c" 1>&6
+-echo "configure:18891: checking for google play services" >&5
+-    GOOGLE_PLAY_SERVICES_LIB="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
+-    GOOGLE_PLAY_SERVICES_RES="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/res"
+-    
+-    
+-    if ! test -e $GOOGLE_PLAY_SERVICES_LIB ; then
+-        { echo "configure: error: You must download Google Play Services to build with native video casting support enabled.  Run the Android SDK tool and install Google Play Services under Extras.  See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&2; echo "configure: error: You must download Google Play Services to build with native video casting support enabled.  Run the Android SDK tool and install Google Play Services under Extras.  See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&5; exit 1; }
+-    fi
+-    echo "$ac_t""$GOOGLE_PLAY_SERVICES_LIB" 1>&6
+-
+-    ANDROID_APPCOMPAT_LIB="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/libs/android-support-v7-appcompat.jar"
+-    ANDROID_APPCOMPAT_RES="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/res"
+-    echo $ac_n "checking for v7 appcompat library""... $ac_c" 1>&6
+-echo "configure:18904: checking for v7 appcompat library" >&5
+-    if ! test -e $ANDROID_APPCOMPAT_LIB ; then
+-        { echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&2; echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&5; exit 1; }
+-    fi
+-    echo "$ac_t""$ANDROID_APPCOMPAT_LIB" 1>&6
+-    
+-    
+-
+-    ANDROID_MEDIAROUTER_LIB="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/libs/android-support-v7-mediarouter.jar"
+-    ANDROID_MEDIAROUTER_RES="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/res"
+-    echo $ac_n "checking for v7 mediarouter library""... $ac_c" 1>&6
+-echo "configure:18915: checking for v7 mediarouter library" >&5
+-    if ! test -e $ANDROID_MEDIAROUTER_LIB ; then
+-        { echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&2; echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled.  Run the Android SDK tool and install Android Support Library under Extras.  See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&5; exit 1; }
+-    fi
+-    echo "$ac_t""$ANDROID_MEDIAROUTER_LIB" 1>&6
+-    
+-    
+-fi
+-
+-
+-
+-
+ if test "$MOZ_ENABLE_GTK" -o "$MOZ_ENABLE_QT"
+ then
+     succeeded=no
+@@ -29180,13 +29140,6 @@
+     (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
+     (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
+     (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
+-    (''' MOZ_NATIVE_DEVICES ''', r''' $MOZ_NATIVE_DEVICES ''')
+-    (''' GOOGLE_PLAY_SERVICES_LIB ''', r''' $GOOGLE_PLAY_SERVICES_LIB ''')
+-    (''' GOOGLE_PLAY_SERVICES_RES ''', r''' $GOOGLE_PLAY_SERVICES_RES ''')
+-    (''' ANDROID_APPCOMPAT_LIB ''', r''' $ANDROID_APPCOMPAT_LIB ''')
+-    (''' ANDROID_APPCOMPAT_RES ''', r''' $ANDROID_APPCOMPAT_RES ''')
+-    (''' ANDROID_MEDIAROUTER_LIB ''', r''' $ANDROID_MEDIAROUTER_LIB ''')
+-    (''' ANDROID_MEDIAROUTER_RES ''', r''' $ANDROID_MEDIAROUTER_RES ''')
+     (''' _PANGOCHK_CFLAGS ''', list(r''' $_PANGOCHK_CFLAGS '''.split()))
+     (''' _PANGOCHK_LIBS ''', list(r''' $_PANGOCHK_LIBS '''.split()))
+     (''' MOZ_PANGO_CFLAGS ''', list(r''' $MOZ_PANGO_CFLAGS '''.split()))