Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/assogiate/, gnome-extra/assogiate/files/
Date: Wed, 02 Oct 2019 18:17:16
Message-Id: 1570039926.2f027053d6776b4d60968d6db6f7010266b2d829.dilfridge@gentoo
1 commit: 2f027053d6776b4d60968d6db6f7010266b2d829
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 2 18:07:26 2019 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 2 18:12:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f027053
7
8 gnome-extra/assogiate: Remove last-rited package, bug 649000
9
10 Closes: https://bugs.gentoo.org/649000
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 gnome-extra/assogiate/Manifest | 1 -
14 gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild | 50 -------------------
15 .../assogiate/files/assogiate-0.2.1-desktop.patch | 19 --------
16 .../assogiate/files/assogiate-0.2.1-gcc-4.7.patch | 17 -------
17 .../files/assogiate-0.2.1-glib-2.32.patch | 57 ----------------------
18 .../files/assogiate-0.2.1-typedialog.patch | 26 ----------
19 gnome-extra/assogiate/metadata.xml | 8 ---
20 7 files changed, 178 deletions(-)
21
22 diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
23 deleted file mode 100644
24 index f3b3960455e..00000000000
25 --- a/gnome-extra/assogiate/Manifest
26 +++ /dev/null
27 @@ -1 +0,0 @@
28 -DIST assogiate-0.2.1.tar.bz2 369446 BLAKE2B 5b2e656eb9b1f77b73e4b736c748c45aac0be6102cc497139e8f11df38caa7874a02fd04e064e057465c2309876e9ea3a6fa5bff7164c4f3c59933f5b9b6cbb0 SHA512 d54148a13c07e6d9526c67f6522ed450e4afa86074972ae195e2fab2080a68c25f7030be21fcc8aab67aaea9b4e2f70993a402bf91e513ca93b83955b9fba8ac
29
30 diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
31 deleted file mode 100644
32 index 4737a2b5217..00000000000
33 --- a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
34 +++ /dev/null
35 @@ -1,50 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI="5"
40 -GCONF_DEBUG="yes"
41 -
42 -inherit autotools eutils flag-o-matic gnome2
43 -
44 -DESCRIPTION="assoGiate is an editor of the file types database for GNOME"
45 -HOMEPAGE="http://www.kdau.com/projects/assogiate"
46 -SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
47 -
48 -LICENSE="GPL-2"
49 -SLOT="0"
50 -KEYWORDS="amd64 ~sparc x86"
51 -IUSE=""
52 -
53 -RDEPEND="
54 - >=dev-libs/glib-2.8:2
55 - >=dev-cpp/glibmm-2.46:2
56 - >=dev-cpp/gtkmm-2.24.4-r3:2.4
57 - >=dev-cpp/libxmlpp-2.40:2.6
58 - >=dev-cpp/gnome-vfsmm-2.26.0-r1
59 -"
60 -DEPEND="${RDEPEND}
61 - app-text/gnome-doc-utils
62 - dev-util/intltool
63 - virtual/pkgconfig
64 -"
65 -
66 -DOCS="AUTHORS ChangeLog NEWS README TODO"
67 -
68 -src_prepare() {
69 - # Fix desktop file
70 - epatch "${FILESDIR}"/${P}-desktop.patch
71 -
72 - # Fix compilation, bug #374911
73 - epatch "${FILESDIR}"/${P}-typedialog.patch
74 -
75 - # Fix building with glib-2.32, bug #417765
76 - epatch "${FILESDIR}"/${P}-glib-2.32.patch
77 -
78 - # Fix building with gcc-4.7
79 - epatch "${FILESDIR}"/${P}-gcc-4.7.patch
80 -
81 - eautoreconf
82 - gnome2_src_prepare
83 -
84 - append-cxxflags -std=c++11
85 -}
86
87 diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
88 deleted file mode 100644
89 index 3944938611d..00000000000
90 --- a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
91 +++ /dev/null
92 @@ -1,19 +0,0 @@
93 -Description: Update assogiate desktop file
94 -Author: Vincent Legout <vincent@××××××.info>
95 -
96 -Index: assogiate/data/assogiate.desktop.in
97 -===================================================================
98 ---- assogiate.orig/data/assogiate.desktop.in 2011-05-02 20:46:29.322670186 +0200
99 -+++ assogiate/data/assogiate.desktop.in 2011-05-02 20:46:47.835433235 +0200
100 -@@ -1,9 +1,9 @@
101 - [Desktop Entry]
102 --Encoding=UTF-8
103 - _Name=File Types Editor
104 - _Comment=Modify the detection and display of file types
105 - Exec=assogiate
106 - Icon=assogiate
107 - Terminal=false
108 - Type=Application
109 --Categories=GNOME;GTK;System;FileTools;
110 -+Categories=GNOME;GTK;System;FileTools;X-GNOME-PersonalSettings;
111 -+OnlyShowIn=GNOME;
112
113 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
114 deleted file mode 100644
115 index 33d13bd067d..00000000000
116 --- a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
117 +++ /dev/null
118 @@ -1,17 +0,0 @@
119 -Description: Fix ftbfs with gcc-4.7
120 -Author: Vincent Legout <vlegout@××××××.org>
121 -Last-Update: 2012-04-04
122 -Bug-Debian: http://bugs.debian.org/667104
123 -
124 -Index: assogiate/libassogiate/mime-package.cc
125 -===================================================================
126 ---- assogiate.orig/libassogiate/mime-package.cc 2012-03-25 10:47:26.524889975 +0200
127 -+++ assogiate/libassogiate/mime-package.cc 2012-04-04 18:54:11.675024484 +0200
128 -@@ -31,6 +31,7 @@
129 - #include <libxml/tree.h>
130 - #include <libxml++/parsers/domparser.h>
131 - #include <libgnomevfsmm/init.h>
132 -+#include <unistd.h>
133 -
134 - /******************************************************************************/
135 - /* Globals */
136
137 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
138 deleted file mode 100644
139 index 0bcecc31e5a..00000000000
140 --- a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
141 +++ /dev/null
142 @@ -1,57 +0,0 @@
143 -Description: Include glib.h instead of individual headers
144 -Author: Vincent Legout <vlegout@××××××.org>
145 -Bug-Debian: http://bugs.debian.org/665507
146 -
147 -Index: assogiate/libassogiate/mime-database.cc
148 -===================================================================
149 ---- assogiate.orig/libassogiate/mime-database.cc 2012-03-25 10:43:34.000000000 +0200
150 -+++ assogiate/libassogiate/mime-database.cc 2012-03-25 10:47:00.072890551 +0200
151 -@@ -23,7 +23,7 @@
152 - #include "private.hh"
153 - #include "mime-database.hh"
154 -
155 --#include <glib/gutils.h>
156 -+#include <glib.h>
157 - #include <glibmm/miscutils.h>
158 -
159 - /******************************************************************************/
160 -Index: assogiate/libassogiate/mime-type.cc
161 -===================================================================
162 ---- assogiate.orig/libassogiate/mime-type.cc 2012-03-25 10:43:34.000000000 +0200
163 -+++ assogiate/libassogiate/mime-type.cc 2012-03-25 10:47:00.072890551 +0200
164 -@@ -23,7 +23,7 @@
165 - #include "private.hh"
166 - #include "mime-type.hh"
167 -
168 --#include <glib/gutils.h>
169 -+#include <glib.h>
170 - #include <gtkmm/icontheme.h>
171 - #include <libxml++/nodes/element.h>
172 - #include <libxml++/nodes/textnode.h>
173 -Index: assogiate/libassogiate/misc/extras.cc
174 -===================================================================
175 ---- assogiate.orig/libassogiate/misc/extras.cc 2012-03-25 10:43:34.000000000 +0200
176 -+++ assogiate/libassogiate/misc/extras.cc 2012-03-25 10:47:00.092890549 +0200
177 -@@ -24,7 +24,7 @@
178 -
179 - #include <algorithm>
180 - #include <stdexcept>
181 --#include <glib/gmem.h>
182 -+#include <glib.h>
183 - #include <glibmm/utility.h>
184 -
185 - /******************************************************************************/
186 -Index: assogiate/src/main.cc
187 -===================================================================
188 ---- assogiate.orig/src/main.cc 2012-03-25 10:43:34.396895145 +0200
189 -+++ assogiate/src/main.cc 2012-03-25 10:47:07.628890386 +0200
190 -@@ -28,8 +28,7 @@
191 - #include <clocale>
192 - #include <iostream>
193 - #include <locale>
194 --#include <glib/goption.h>
195 --#include <glib/gutils.h>
196 -+#include <glib.h>
197 - #include <glibmm/optionentry.h>
198 - #include <gtk/gtkaboutdialog.h>
199 - #include <gtk/gtkversion.h>
200
201 diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
202 deleted file mode 100644
203 index 188c69be7ca..00000000000
204 --- a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
205 +++ /dev/null
206 @@ -1,26 +0,0 @@
207 -Description: Fix ftbfs
208 -Author: Vincent Legout <vincent@××××××.info>
209 -Bug-Debian: http://bugs.debian.org/624924
210 -
211 -Index: assogiate/src/type-dialog.cc
212 -===================================================================
213 ---- assogiate.orig/src/type-dialog.cc 2011-05-09 16:51:09.951622099 +0200
214 -+++ assogiate/src/type-dialog.cc 2011-05-09 16:51:53.293459257 +0200
215 -@@ -144,7 +144,7 @@
216 - general_upper->pack_start(*Gtk::manage(general_info), true, true);
217 -
218 - if (renameable) {
219 -- Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector());
220 -+ Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector(), false);
221 - cb->signal_changed().connect
222 - (sigc::mem_fun(*this, &TypeDialog::on_category_changed));
223 - m_category_widget = cb;
224 -@@ -622,7 +622,7 @@
225 - } else {
226 - AddItemDialog adder(this, _("Add File Contents Rule"));
227 -
228 -- Gtk::ComboBox type(MagicTypesStore::get());
229 -+ Gtk::ComboBox type(MagicTypesStore::get(), false);
230 - type.pack_start(MagicTypesColumns::get().name);
231 - adder.add_item(_("_Type:"), type, true);
232 -
233
234 diff --git a/gnome-extra/assogiate/metadata.xml b/gnome-extra/assogiate/metadata.xml
235 deleted file mode 100644
236 index 39980802b1d..00000000000
237 --- a/gnome-extra/assogiate/metadata.xml
238 +++ /dev/null
239 @@ -1,8 +0,0 @@
240 -<?xml version="1.0" encoding="UTF-8"?>
241 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
242 -<pkgmetadata>
243 -<maintainer type="project">
244 - <email>gnome@g.o</email>
245 - <name>Gentoo GNOME Desktop</name>
246 -</maintainer>
247 -</pkgmetadata>