summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnome-extra/assogiate
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnome-extra/assogiate')
-rw-r--r--gnome-extra/assogiate/Manifest1
-rw-r--r--gnome-extra/assogiate/assogiate-0.2.1.ebuild46
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch19
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch17
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch57
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch26
-rw-r--r--gnome-extra/assogiate/metadata.xml5
7 files changed, 171 insertions, 0 deletions
diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
new file mode 100644
index 000000000000..3b2529feaebe
--- /dev/null
+++ b/gnome-extra/assogiate/Manifest
@@ -0,0 +1 @@
+DIST assogiate-0.2.1.tar.bz2 369446 SHA256 e5655af3a148f3446908ede69d47e005b2eadacbfe4e3d1a2b61d467ecac45ca SHA512 d54148a13c07e6d9526c67f6522ed450e4afa86074972ae195e2fab2080a68c25f7030be21fcc8aab67aaea9b4e2f70993a402bf91e513ca93b83955b9fba8ac WHIRLPOOL c4ff6c9ffff041166164882a9bacff79d5cc1febab8a599212c84585a589daa333504f93d05e7d21abd391ad0f285887612b85d717ee56eeb9461f857d7037f3
diff --git a/gnome-extra/assogiate/assogiate-0.2.1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
new file mode 100644
index 000000000000..76b9d844e480
--- /dev/null
+++ b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit autotools gnome2 eutils
+
+DESCRIPTION="assoGiate is an editor of the file types database for GNOME"
+HOMEPAGE="http://www.kdau.com/projects/assogiate"
+SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.8:2
+ >=dev-cpp/glibmm-2.8:2
+ >=dev-cpp/gtkmm-2.8:2.4
+ >=dev-cpp/libxmlpp-2.14
+ >=dev-cpp/gnome-vfsmm-2.6"
+DEPEND="${RDEPEND}
+ app-text/gnome-doc-utils
+ virtual/pkgconfig
+ dev-util/intltool"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+ # Fix desktop file
+ epatch "${FILESDIR}/${P}-desktop.patch"
+
+ # Fix compilation, bug #374911
+ epatch "${FILESDIR}/${P}-typedialog.patch"
+
+ # Fix building with glib-2.32, bug #417765
+ epatch "${FILESDIR}/${P}-glib-2.32.patch"
+
+ # Fix building with gcc-4.7
+ epatch "${FILESDIR}/${P}-gcc-4.7.patch"
+
+ eautoreconf
+ gnome2_src_prepare
+}
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
new file mode 100644
index 000000000000..3944938611de
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
@@ -0,0 +1,19 @@
+Description: Update assogiate desktop file
+Author: Vincent Legout <vincent@legout.info>
+
+Index: assogiate/data/assogiate.desktop.in
+===================================================================
+--- assogiate.orig/data/assogiate.desktop.in 2011-05-02 20:46:29.322670186 +0200
++++ assogiate/data/assogiate.desktop.in 2011-05-02 20:46:47.835433235 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=File Types Editor
+ _Comment=Modify the detection and display of file types
+ Exec=assogiate
+ Icon=assogiate
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;System;FileTools;
++Categories=GNOME;GTK;System;FileTools;X-GNOME-PersonalSettings;
++OnlyShowIn=GNOME;
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
new file mode 100644
index 000000000000..33d13bd067d5
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
@@ -0,0 +1,17 @@
+Description: Fix ftbfs with gcc-4.7
+Author: Vincent Legout <vlegout@debian.org>
+Last-Update: 2012-04-04
+Bug-Debian: http://bugs.debian.org/667104
+
+Index: assogiate/libassogiate/mime-package.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-package.cc 2012-03-25 10:47:26.524889975 +0200
++++ assogiate/libassogiate/mime-package.cc 2012-04-04 18:54:11.675024484 +0200
+@@ -31,6 +31,7 @@
+ #include <libxml/tree.h>
+ #include <libxml++/parsers/domparser.h>
+ #include <libgnomevfsmm/init.h>
++#include <unistd.h>
+
+ /******************************************************************************/
+ /* Globals */
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
new file mode 100644
index 000000000000..0bcecc31e5ab
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
@@ -0,0 +1,57 @@
+Description: Include glib.h instead of individual headers
+Author: Vincent Legout <vlegout@debian.org>
+Bug-Debian: http://bugs.debian.org/665507
+
+Index: assogiate/libassogiate/mime-database.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-database.cc 2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-database.cc 2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-database.hh"
+
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/miscutils.h>
+
+ /******************************************************************************/
+Index: assogiate/libassogiate/mime-type.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-type.cc 2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-type.cc 2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-type.hh"
+
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <gtkmm/icontheme.h>
+ #include <libxml++/nodes/element.h>
+ #include <libxml++/nodes/textnode.h>
+Index: assogiate/libassogiate/misc/extras.cc
+===================================================================
+--- assogiate.orig/libassogiate/misc/extras.cc 2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/misc/extras.cc 2012-03-25 10:47:00.092890549 +0200
+@@ -24,7 +24,7 @@
+
+ #include <algorithm>
+ #include <stdexcept>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <glibmm/utility.h>
+
+ /******************************************************************************/
+Index: assogiate/src/main.cc
+===================================================================
+--- assogiate.orig/src/main.cc 2012-03-25 10:43:34.396895145 +0200
++++ assogiate/src/main.cc 2012-03-25 10:47:07.628890386 +0200
+@@ -28,8 +28,7 @@
+ #include <clocale>
+ #include <iostream>
+ #include <locale>
+-#include <glib/goption.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/optionentry.h>
+ #include <gtk/gtkaboutdialog.h>
+ #include <gtk/gtkversion.h>
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
new file mode 100644
index 000000000000..188c69be7cad
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
@@ -0,0 +1,26 @@
+Description: Fix ftbfs
+Author: Vincent Legout <vincent@legout.info>
+Bug-Debian: http://bugs.debian.org/624924
+
+Index: assogiate/src/type-dialog.cc
+===================================================================
+--- assogiate.orig/src/type-dialog.cc 2011-05-09 16:51:09.951622099 +0200
++++ assogiate/src/type-dialog.cc 2011-05-09 16:51:53.293459257 +0200
+@@ -144,7 +144,7 @@
+ general_upper->pack_start(*Gtk::manage(general_info), true, true);
+
+ if (renameable) {
+- Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector());
++ Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector(), false);
+ cb->signal_changed().connect
+ (sigc::mem_fun(*this, &TypeDialog::on_category_changed));
+ m_category_widget = cb;
+@@ -622,7 +622,7 @@
+ } else {
+ AddItemDialog adder(this, _("Add File Contents Rule"));
+
+- Gtk::ComboBox type(MagicTypesStore::get());
++ Gtk::ComboBox type(MagicTypesStore::get(), false);
+ type.pack_start(MagicTypesColumns::get().name);
+ adder.add_item(_("_Type:"), type, true);
+
diff --git a/gnome-extra/assogiate/metadata.xml b/gnome-extra/assogiate/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/gnome-extra/assogiate/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>