From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1NTcVs-0000na-U5 for garchives@archives.gentoo.org; Sat, 09 Jan 2010 14:42:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66EAEE077C; Sat, 9 Jan 2010 14:42:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 266EDE077C for ; Sat, 9 Jan 2010 14:42:00 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id BBEE767A48 for ; Sat, 9 Jan 2010 14:41:59 +0000 (UTC) Received: from idl0r by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NTcVr-00065f-5r for gentoo-commits@lists.gentoo.org; Sat, 09 Jan 2010 14:41:59 +0000 From: "Christian Ruppert (idl0r)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, idl0r@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-cdr/isomaster/files: isomaster-1.3.7-noiniparser.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: isomaster-1.3.7-noiniparser.patch X-VCS-Directories: app-cdr/isomaster/files X-VCS-Committer: idl0r X-VCS-Committer-Name: Christian Ruppert Content-Type: text/plain; charset=utf8 Message-Id: Sender: Christian Ruppert Date: Sat, 09 Jan 2010 14:41:59 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 17a25a49-1881-49c5-a6a0-bb6b838a7a51 X-Archives-Hash: 8b9bc04029f47adb8171b8895ca4fc44 idl0r 10/01/09 14:41:59 Added: isomaster-1.3.7-noiniparser.patch Log: Version bump to 1.3.7. (Portage version: 2.2_rc61/cvs/Linux x86_64) Revision Changes Path 1.1 app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.= patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/isomaster/= files/isomaster-1.3.7-noiniparser.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-cdr/isomaster/= files/isomaster-1.3.7-noiniparser.patch?rev=3D1.1&content-type=3Dtext/pla= in Index: isomaster-1.3.7-noiniparser.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -Naurp -p isomaster-1.3.7.orig/Makefile isomaster-1.3.7/Makefile --- isomaster-1.3.7.orig/Makefile 2010-01-09 14:18:00.333993253 +0100 +++ isomaster-1.3.7/Makefile 2010-01-09 15:17:31.047246400 +0100 @@ -65,21 +65,18 @@ OBJECTS =3D isomaster.o window.o browser.o =20 all: translations isomaster.desktop isomaster =20 -isomaster: $(OBJECTS) lib iniparser +isomaster: $(OBJECTS) lib @echo 'Linking isomaster' - @$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CF= LAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster + @$(CC) $(LDFLAGS) $(OBJECTS) bk/bk.a `pkg-config --libs gtk+-2.0` -lini= parser -o isomaster =20 # static pattern rule $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile @echo 'Compiling' $< - @$(CC) $< $(CFLAGS) $(CPPFLAGS) -c -o $@ + @$(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@ =20 lib: cd bk && $(MAKE) =20 -iniparser: - cd iniparser-2.17 && $(MAKE) - translations: ifndef WITHOUT_NLS cd po && $(MAKE) @@ -94,7 +91,6 @@ bk-doc: =20 clean:=20 cd bk && $(MAKE) clean - cd iniparser-2.17 && $(MAKE) clean ifndef WITHOUT_NLS cd po && $(MAKE) clean endif diff -Naurp -p isomaster-1.3.7.orig/settings.c isomaster-1.3.7/settings.c --- isomaster-1.3.7.orig/settings.c 2010-01-09 14:18:00.329993692 +0100 +++ isomaster-1.3.7/settings.c 2010-01-09 15:19:29.052995022 +0100 @@ -607,7 +607,7 @@ void loadSettings(void) GBLappSettings.recentlyOpen[i] =3D NULL; if(GBLsettingsDictionary !=3D NULL) { - char configNameStr[20] =3D "ui:recentlyopen"; + char configNameStr[46] =3D "ui:recentlyopen"; snprintf(configNameStr + 15, 20, "%d", i); =20 tempStr =3D iniparser_getstring(GBLsettingsDictionary,=20 @@ -892,7 +892,7 @@ void writeSettings(void) =20 for(int i =3D 0; i < 5; i++) { - char configNameStr[20] =3D "ui:recentlyopen"; + char configNameStr[46] =3D "ui:recentlyopen"; snprintf(configNameStr + 15, 20, "%d", i); =20 iniparser_setstr(GBLsettingsDictionary, configNameStr,=20 diff -Naurp -p isomaster-1.3.7.orig/settings.h isomaster-1.3.7/settings.h --- isomaster-1.3.7.orig/settings.h 2010-01-09 14:18:00.330993252 +0100 +++ isomaster-1.3.7/settings.h 2010-01-09 14:34:59.495995595 +0100 @@ -4,7 +4,7 @@ #include =20 #include "isomaster.h" -#include "iniparser-2.17/src/iniparser.h" +#include =20 #define ISOMASTER_DEFAULT_WINDOW_WIDTH 500 #define ISOMASTER_DEFAULT_WINDOW_HEIGHT 550