summaryrefslogtreecommitdiff
path: root/gnome-extra/assogiate/files
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/assogiate/files')
-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
4 files changed, 0 insertions, 119 deletions
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
deleted file mode 100644
index 3944938611de..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 33d13bd067d5..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 0bcecc31e5ab..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 188c69be7cad..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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);
-