Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=455e25f46f960e5da08cc39f5d8ee34d40d14b26
commit 455e25f46f960e5da08cc39f5d8ee34d40d14b26 Author: DeX77 <[email protected]> Date: Thu May 2 18:12:58 2013 +0200 glib2-2.36.1-4-x86_64 * release bump * fix skype diff --git a/source/base/glib2/FrugalBuild b/source/base/glib2/FrugalBuild index d75edde..e1b5a55 100644 --- a/source/base/glib2/FrugalBuild +++ b/source/base/glib2/FrugalBuild @@ -8,7 +8,7 @@ options+=('asneeded') pkgname=glib2 pkgver=2.36.1 -pkgrel=3 +pkgrel=4 pkgdesc="Common C routines used by GTK+ and other libraries" url="http://www.gtk.org/"; rodepends=('scriptlet-core') @@ -50,6 +50,9 @@ build() #gcc4.6 #export CFLAGS="$CFLAGS -fpermissive" + #Fix for Skype + export CFLAGS="$CFLAGS -Wall" + Fbuild # --enable-static \ # --enable-debug=yes \ diff --git a/source/devel-extra/openjdk/openjre.sh b/source/devel-extra/openjdk/openjre.sh old mode 100644 new mode 100755 index aba9b3e..d75bc85b --- a/source/devel-extra/openjdk/openjre.sh +++ b/source/devel-extra/openjdk/openjre.sh @@ -1,15 +1,11 @@ -export OPENJREDIR=/usr/lib/jvm/java-7-openjdk/jre -export MANPATH=$MANPATH:$OPENJREDIR/man -export CLASSPATH=$CLASSPATH:$OPENJREDIR/lib +#!/bin/sh -# if you put "java=foo" (where foo != openjdk) to /etc/sysconfig/java, -# then this script won't touch the JAVA_HOME variable -[ -e /etc/sysconfig/java ] && source /etc/sysconfig/java -if [ -z "$java" -o "$java" == "openjdk" ]; then - if [ ! -f /etc/profile.d/openjdk.sh ]; then - export JAVA_HOME=$OPENJREDIR - fi - export PATH=$OPENJREDIR/bin:$PATH -else - export PATH=$PATH:$OPENJREDIR/bin -fi + KEYSTORE="/usr/lib/jvm/java-7-openjdk/jre/lib/security/cacerts" + + for i in `find /etc/ssl/certs ! -type d` + do + filename=$(basename "$i") + aliasname="${filename%.*}" + /usr/lib/jvm/java-7-openjdk/jre/bin/keytool -import -keystore $KEYSTORE -storepass changeit -noprompt -file $i -alias $aliasname + done + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
