From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Sat, 8 Aug 2015 13:49:04 -0700
Subject: proj/gentoo: Initial commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 .../assogiate/files/assogiate-0.2.1-desktop.patch  | 19 ++++++++
 .../assogiate/files/assogiate-0.2.1-gcc-4.7.patch  | 17 +++++++
 .../files/assogiate-0.2.1-glib-2.32.patch          | 57 ++++++++++++++++++++++
 .../files/assogiate-0.2.1-typedialog.patch         | 26 ++++++++++
 4 files changed, 119 insertions(+)
 create mode 100644 gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
 create mode 100644 gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
 create mode 100644 gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
 create mode 100644 gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch

(limited to 'gnome-extra/assogiate/files')

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 00000000000..3944938611d
--- /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 00000000000..33d13bd067d
--- /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 00000000000..0bcecc31e5a
--- /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 00000000000..188c69be7ca
--- /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);
+ 
-- 
cgit v1.2.1