diff options
Diffstat (limited to 'x11-libs/libcompizconfig')
-rw-r--r-- | x11-libs/libcompizconfig/ChangeLog | 159 | ||||
-rw-r--r-- | x11-libs/libcompizconfig/Manifest | 1 | ||||
-rw-r--r-- | x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch | 239 | ||||
-rw-r--r-- | x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild | 38 | ||||
-rw-r--r-- | x11-libs/libcompizconfig/metadata.xml | 6 |
5 files changed, 0 insertions, 443 deletions
diff --git a/x11-libs/libcompizconfig/ChangeLog b/x11-libs/libcompizconfig/ChangeLog deleted file mode 100644 index 4f96a305..00000000 --- a/x11-libs/libcompizconfig/ChangeLog +++ /dev/null @@ -1,159 +0,0 @@ -# ChangeLog for x11-libs/libcompizconfig -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/ChangeLog,v 1.32 2012/09/25 14:40:53 pinkbyte Exp $ - - 25 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> - -libcompizconfig-0.8.4-r2.ebuild, -files/libcompizconfig-undefinedref.patch: - Drop old - - 30 Aug 2012; Sergey Popov <pinkbyte@gentoo.org> metadata.xml: - Remove myself and proxy maintainer from maintainers - - 18 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> - libcompizconfig-0.8.8.ebuild: - Update to EAPI4 and prune_libtool_files but use --all argument wrt #421197 - - 05 May 2012; Jeff Horelick <jdhore@gentoo.org> - libcompizconfig-0.8.4-r2.ebuild, libcompizconfig-0.8.8.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - -*libcompizconfig-0.8.8 (20 Apr 2012) - - 20 Apr 2012; Naohiro Aota <naota@gentoo.org> +libcompizconfig-0.8.8.ebuild, - metadata.xml: - Version bump. Assign Pinkbyte as maintainer. - - 21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> - -libcompizconfig-0.8.4.ebuild, -libcompizconfig-0.8.4-r1.ebuild, - libcompizconfig-0.8.4-r2.ebuild: - Fix slot-deps on libs, remove old - -*libcompizconfig-0.8.4-r2 (04 Sep 2010) - - 04 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org> - +libcompizconfig-0.8.4-r2.ebuild: - Disable static libraries (they are linked against modules anyway), remove - .la files. - - 14 May 2010; Joseph Jezak <josejx@gentoo.org> - libcompizconfig-0.8.4-r1.ebuild: - Marked ~ppc/~ppc64 for bug #289287. - - 15 Apr 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - libcompizconfig-0.8.4-r1.ebuild: - Added protobuf to RDEPEND as it was added by mistake solely to DEPEND. - Restricted tests as they fail because of intltool - fixes bug 295819 - -*libcompizconfig-0.8.4-r1 (03 Apr 2010) - - 03 Apr 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - +libcompizconfig-0.8.4-r1.ebuild: - Replaced compiz ~ deps with >= deps to support the new compiz-0.8.6 - release and to avoid future dep issues. - Did a revbump to avoid issues with installed packages. - Fixes bug 289287. - - 18 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> - libcompizconfig-0.8.4.ebuild: - Raise intltool depend to 0.41.0 wrt #295819, thanks to Diego E. Pettenò - for reporting. - - 20 Dec 2009; Romain Perier <mrpouet@gentoo.org> - -libcompizconfig-0.6.0.ebuild, -libcompizconfig-0.8.2.ebuild: - Clean up old versions - - 14 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> - -libcompizconfig-0.8.2-r2.ebuild: - Drop masked version since newer unmasked are around. - -*libcompizconfig-0.8.4 (15 Oct 2009) - - 15 Oct 2009; Romain Perier <mrpouet@gentoo.org> - +libcompizconfig-0.8.4.ebuild: - Version bump. - -*libcompizconfig-0.8.2-r2 (16 Jul 2009) - - 16 Jul 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - -libcompizconfig-0.8.2-r1.ebuild, +libcompizconfig-0.8.2-r2.ebuild, - files/libcompizconfig-0.8.2-allow-system-libiniparser.patch: - Added libcompizconfig-0.8.2-r2 from the overlay - thanks to John Keeping - for the patch. - Fixes bug 259715. - - 27 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - +files/libcompizconfig-0.8.2-allow-system-libiniparser.patch, - +libcompizconfig-0.8.2-r1.ebuild: - Added patch to allow the use of system iniparser. Many thanks to Diego E. - Pettenò <flameeyes@gentoo.org> for the help with auto-tools. Dropped - ppc/ppc64 keywords until iniparser is keyworded. Fixes bug 259715. - -*libcompizconfig-0.8.2-r1 (27 Apr 2009) - - 25 Apr 2009; Brent Baude <ranger@gentoo.org> libcompizconfig-0.8.2.ebuild: - Marking libcompizconfig-0.8.2 ~ppc for bug 246804 - - 25 Apr 2009; Brent Baude <ranger@gentoo.org> libcompizconfig-0.8.2.ebuild: - Marking libcompizconfig-0.8.2 ~ppc64 for bug 246804 - - 11 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - -libcompizconfig-0.7.8.ebuild: - Removing old compiz 0.7.8 ebuilds - affected by bug 263678. - -*libcompizconfig-0.8.2 (03 Apr 2009) - - 03 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - +libcompizconfig-0.8.2.ebuild: - Bumped compiz to the 0.8.2 release. - - 15 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - metadata.xml, libcompizconfig-0.7.8.ebuild: - Removed the mirror restriction that was used for the overlay. - - 13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> - libcompizconfig-0.7.8.ebuild: - Run intltoolize (and depend on intltool), reported by Mahmoud Hashemi. - - 09 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> - libcompizconfig-0.7.8.ebuild: - Call eautoreconf or the patch won't have any effect. - - 01 Nov 2008; Hanno Boeck <hanno@gentoo.org> - +files/libcompizconfig-undefinedref.patch: - Add missing patch. - - 27 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - libcompizconfig-0.7.8.ebuild: - Removed the bug reporting warning that was copied from the desktop-effects - overlay by mistake. - -*libcompizconfig-0.7.8 (27 Oct 2008) - - 27 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - metadata.xml, +libcompizconfig-0.7.8.ebuild: - Added compiz-0.7.8 to the tree - - 29 Jun 2008; Torsten Veller <tove@gentoo.org> - libcompizconfig-0.6.0.ebuild: - Add missing die: || "..." -> || die "..." - - 24 Jun 2008; Hanno Boeck <hanno@gentoo.org> libcompizconfig-0.6.0.ebuild: - Add pkgconfig dep. - - 25 Oct 2007; Olivier Crête <tester@gentoo.org> - libcompizconfig-0.6.0.ebuild: - Marked ~amd64 - - 24 Oct 2007; Luca Barbato <lu_zero@gentoo.org> - libcompizconfig-0.6.0.ebuild: - Marked ~ppc - - 24 Oct 2007; Hanno Boeck <hanno@gentoo.org> libcompizconfig-0.6.0.ebuild: - QA fixes. - -*libcompizconfig-0.6.0 (23 Oct 2007) - - 23 Oct 2007; Hanno Boeck <hanno@gentoo.org> +metadata.xml, - +libcompizconfig-0.6.0.ebuild: - Initial compiz-fusion commit, ebuild based on xeffects overlay. - diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest deleted file mode 100644 index a052df52..00000000 --- a/x11-libs/libcompizconfig/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libcompizconfig-0.8.8.tar.bz2 318176 SHA256 50a81aba31d9517587f7d046b7161eb4204ddceb422d09d036a412bb80381490 SHA512 1ba2f6143870d981e174c47fddb9fdd072a1c64a5a5f07779bd6261767a2c1a7612bdcb3f62a76c203f4ab630542c8ae750fff3ec30a0305f8851584c6a5d6bb WHIRLPOOL 14139c93bb67235c5a9e4581e11a6474a1ff0108c8e84d3401006d26c160eaf50c0b3c9a9c69c12d00919850ee6d20a9c81660a6bec180c69d459c3d2a89775b diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch deleted file mode 100644 index 3028faf9..00000000 --- a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff -Naur libcompizconfig-0.8.2.orig/config.h.in libcompizconfig-0.8.2/config.h.in ---- libcompizconfig-0.8.2.orig/config.h.in 2009-03-05 15:29:12.000000000 +0000 -+++ libcompizconfig-0.8.2/config.h.in 2009-05-02 14:55:48.000000000 +0100 -@@ -30,6 +30,9 @@ - /* Define if your <locale.h> file defines LC_MESSAGES. */ - #undef HAVE_LC_MESSAGES - -+/* Define to 1 if you have the `iniparser' library (-liniparser). */ -+#undef HAVE_LIBINIPARSER -+ - /* Define to 1 if you have the `protobuf' library (-lprotobuf). */ - #undef HAVE_LIBPROTOBUF - -diff -Naur libcompizconfig-0.8.2.orig/configure.ac libcompizconfig-0.8.2/configure.ac ---- libcompizconfig-0.8.2.orig/configure.ac 2009-03-05 03:22:22.000000000 +0000 -+++ libcompizconfig-0.8.2/configure.ac 2009-05-02 14:55:48.000000000 +0100 -@@ -116,6 +116,16 @@ - fi - AM_CONDITIONAL([USE_PROTOBUF], [test "x$use_protobuf" = "xyes"]) - -+AC_ARG_WITH(internal-iniparser, -+ [AS_HELP_STRING([--without-internal-iniparser],[Don't use bundled iniparser lib])], -+ [], [with_internal_iniparser=yes]) -+ -+if test "x$with_internal_iniparser" = "xno"; then -+ AC_CHECK_LIB([iniparser], [iniparser_getnsec], [], -+ [AC_MSG_ERROR([Error! You need to have libiniparser])]) -+fi -+AM_CONDITIONAL([WITH_INTERNAL_INIPARSER], [test "x$with_internal_iniparser" = "xyes"]) -+ - AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes], [have_inotify=no]) - - AC_ARG_ENABLE(debug, -diff -Naur libcompizconfig-0.8.2.orig/include/ccs.h libcompizconfig-0.8.2/include/ccs.h ---- libcompizconfig-0.8.2.orig/include/ccs.h 2009-03-05 03:22:22.000000000 +0000 -+++ libcompizconfig-0.8.2/include/ccs.h 2009-05-02 14:55:48.000000000 +0100 -@@ -695,19 +695,9 @@ - - /* INI file stuff */ - --typedef struct _dictionary_ --{ -- /** Number of entries in dictionary */ -- int n; -- /** Storage size */ -- int size; -- /** List of string values */ -- char **val; -- /** List of string keys */ -- char **key ; -- /** List of hash values for keys */ -- unsigned *hash; --} IniDictionary; -+#include <iniparser.h> -+ -+typedef dictionary IniDictionary; - - IniDictionary* ccsIniNew (void); - IniDictionary* ccsIniOpen (const char *fileName); -diff -Naur libcompizconfig-0.8.2.orig/src/Makefile.am libcompizconfig-0.8.2/src/Makefile.am ---- libcompizconfig-0.8.2.orig/src/Makefile.am 2009-03-05 15:28:59.000000000 +0000 -+++ libcompizconfig-0.8.2/src/Makefile.am 2009-05-02 14:55:48.000000000 +0100 -@@ -39,14 +39,17 @@ - lists.c \ - compiz.cpp \ - config.c \ -- iniparser.c \ - ini.c \ - bindings.c \ - filewatch.c \ -- ccs-private.h \ -- iniparser.h -+ ccs-private.h - - libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB) - - lib_LTLIBRARIES=libcompizconfig.la - -+if WITH_INTERNAL_INIPARSER -+ -+ libcompizconfig_la_SOURCES += iniparser.h iniparser.c -+ -+endif -diff -Naur libcompizconfig-0.8.2.orig/src/ini.c libcompizconfig-0.8.2/src/ini.c ---- libcompizconfig-0.8.2.orig/src/ini.c 2009-03-05 03:22:22.000000000 +0000 -+++ libcompizconfig-0.8.2/src/ini.c 2009-05-02 14:56:12.000000000 +0100 -@@ -23,9 +23,10 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <errno.h> -+#include <ctype.h> - - #include <ccs.h> --#include "iniparser.h" -+#include <iniparser.h> - - /** - * Creates the parent directory for @fileName, recursively creating a directory -@@ -77,7 +78,7 @@ - if (file) - fclose (file); - -- return iniparser_new ((char*) fileName); -+ return iniparser_load ((char*) fileName); - } - - IniDictionary* -@@ -89,17 +90,22 @@ - void - ccsIniClose (IniDictionary *dictionary) - { -- iniparser_free (dictionary); -+ iniparser_freedict (dictionary); - } - - void - ccsIniSave (IniDictionary *dictionary, - const char *fileName) - { -+ FILE *f; - if (!ccsCreateDirFor (fileName)) - return; - -- iniparser_dump_ini (dictionary, fileName); -+ f = fopen(fileName, "w"); -+ if(!f) -+ return; -+ iniparser_dump_ini (dictionary, f); -+ fclose(f); - } - - static char* -@@ -127,11 +133,11 @@ - char *sectionName; - - asprintf (§ionName, "%s:%s", section, entry); -- -+/* - if (!iniparser_find_entry (dictionary, (char*) section)) - iniparser_add_entry (dictionary, (char*) section, NULL, NULL); -- -- iniparser_setstr (dictionary, sectionName, (char*) value); -+*/ -+ iniparser_set (dictionary, sectionName, (char*) value); - - free (sectionName); - } -diff -Naur libcompizconfig-0.8.2.orig/src/iniparser.h libcompizconfig-0.8.2/src/iniparser.h ---- libcompizconfig-0.8.2.orig/src/iniparser.h 2009-03-05 03:22:22.000000000 +0000 -+++ libcompizconfig-0.8.2/src/iniparser.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,65 +0,0 @@ --/* -- Based upon libiniparser, by Nicolas Devillard -- Hacked into 1 file (m-iniparser) by Freek/2005 -- Original terms following: -- -- -- - -- -- Copyright (c) 2000 by Nicolas Devillard (ndevilla AT free DOT fr). -- -- Written by Nicolas Devillard. Not derived from licensed software. -- -- Permission is granted to anyone to use this software for any -- purpose on any computer system, and to redistribute it freely, -- subject to the following restrictions: -- -- 1. The author is not responsible for the consequences of use of -- this software, no matter how awful, even if they arise -- from defects in it. -- -- 2. The origin of this software must not be misrepresented, either -- by explicit claim or by omission. -- -- 3. Altered versions must be plainly marked as such, and must not -- be misrepresented as being the original software. -- -- 4. This notice may not be removed or altered. -- -- */ -- -- --#ifndef _INIPARSER_H_ --#define _INIPARSER_H_ --#include <stdio.h> --#include <stdlib.h> --#include <string.h> --#include <unistd.h> --#include <ctype.h> -- --#include <ccs.h> -- --typedef IniDictionary dictionary; -- --typedef struct _FileLock --{ -- int fd; --} FileLock; -- --/* generated by genproto */ -- --dictionary * iniparser_new(char *ininame); --dictionary * dictionary_new(int size); --void iniparser_free(dictionary * d); -- -- --int iniparser_getnsec(dictionary * d); --char * iniparser_getsecname(dictionary * d, int n); --void iniparser_dump_ini(dictionary * d, const char * file_name); --char * iniparser_getstring(dictionary * d, char * key, char * def); --void iniparser_add_entry(dictionary * d, char * sec, char * key, char * val); --int iniparser_find_entry(dictionary * ini, char * entry); --int iniparser_setstr(dictionary * ini, char * entry, char * val); --void iniparser_unset(dictionary * ini, char * entry); -- --#endif -- -diff -Naur libcompizconfig-0.8.2.orig/src/main.c libcompizconfig-0.8.2/src/main.c ---- libcompizconfig-0.8.2.orig/src/main.c 2009-03-05 03:22:22.000000000 +0000 -+++ libcompizconfig-0.8.2/src/main.c 2009-05-02 14:56:26.000000000 +0100 -@@ -34,9 +34,9 @@ - #include <math.h> - - #include <ccs.h> -+#include <iniparser.h> - - #include "ccs-private.h" --#include "iniparser.h" - - Bool basicMetadata = FALSE; - -@@ -2577,7 +2577,7 @@ - return FALSE; - fclose (fp); - -- importFile = iniparser_new ((char *) fileName); -+ importFile = iniparser_load ((char *) fileName); - if (!importFile) - return FALSE; - diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild deleted file mode 100644 index 5682e96c..00000000 --- a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild,v 1.3 2012/06/18 18:36:02 ssuominen Exp $ - -EAPI=4 -inherit eutils - -DESCRIPTION="Compiz Configuration System" -HOMEPAGE="http://www.compiz.org/" -SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="dev-libs/libxml2 - dev-libs/protobuf - >=x11-wm/compiz-${PV} - x11-libs/libX11" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.41 - virtual/pkgconfig - x11-proto/xproto" - -RESTRICT="test" - -src_configure() { - econf \ - --enable-fast-install \ - --disable-static -} - -src_install() { - emake DESTDIR="${D}" install - dodoc TODO - prune_libtool_files --all -} diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml deleted file mode 100644 index 237116b4..00000000 --- a/x11-libs/libcompizconfig/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>desktop-effects</herd> -<longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription> -</pkgmetadata> |