1 |
commit: 3623db1b6100587933a99f7d55a3afe0a4e8b6bb |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 8 16:53:39 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 8 16:53:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3623db1b |
7 |
|
8 |
media-sound/gmtp: Fix building under -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706860 |
11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
.../gmtp/files/gmtp-1.3.11-fno-common.patch | 375 +++++++++++++++++++++ |
15 |
media-sound/gmtp/gmtp-1.3.11.ebuild | 14 +- |
16 |
2 files changed, 384 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch b/media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..e75d8130dc2 |
21 |
--- /dev/null |
22 |
+++ b/media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch |
23 |
@@ -0,0 +1,375 @@ |
24 |
+--- a/src/dnd.h |
25 |
++++ b/src/dnd.h |
26 |
+@@ -35,7 +35,7 @@ |
27 |
+ }; |
28 |
+ |
29 |
+ /* Drag data format listing for gtk_drag_dest_set() */ |
30 |
+- GtkTargetEntry _gmtp_drop_types[3]; |
31 |
++ extern GtkTargetEntry _gmtp_drop_types[3]; |
32 |
+ |
33 |
+ #define gmtp_drag_dest_set(widget) gtk_drag_dest_set(widget, \ |
34 |
+ GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, \ |
35 |
+--- a/src/interface.h |
36 |
++++ b/src/interface.h |
37 |
+@@ -108,12 +108,12 @@ |
38 |
+ }; |
39 |
+ |
40 |
+ // Main Window widgets |
41 |
+- GtkListStore *fileList; |
42 |
+- GtkTreeStore *folderList; |
43 |
+- GtkTreeSelection *fileSelection; |
44 |
+- GtkTreeSelection *folderSelection; |
45 |
+- gulong folderSelectHandler; |
46 |
+- gulong fileSelectHandler; |
47 |
++ extern GtkListStore *fileList; |
48 |
++ extern GtkTreeStore *folderList; |
49 |
++ extern GtkTreeSelection *fileSelection; |
50 |
++ extern GtkTreeSelection *folderSelection; |
51 |
++ extern gulong folderSelectHandler; |
52 |
++ extern gulong fileSelectHandler; |
53 |
+ |
54 |
+ |
55 |
+ /** |
56 |
+@@ -252,22 +252,22 @@ |
57 |
+ void __fileMove(GtkTreeRowReference *Row); |
58 |
+ |
59 |
+ // Flags for overwriting files of host PC and device. |
60 |
+- gint fileoverwriteop; |
61 |
++ extern gint fileoverwriteop; |
62 |
+ // Flag to allow overwrite of files on device. |
63 |
+- gint deviceoverwriteop; |
64 |
++ extern gint deviceoverwriteop; |
65 |
+ |
66 |
+ // Find options and variables. |
67 |
+- gboolean inFindMode; |
68 |
+- GSList *searchList; |
69 |
++ extern gboolean inFindMode; |
70 |
++ extern GSList *searchList; |
71 |
+ |
72 |
+ /** |
73 |
+ * Destroys a file listing object. |
74 |
+ * @param file - pointer to the FileListStruc object. |
75 |
+ */ |
76 |
+ void g_free_search(FileListStruc *file); |
77 |
+- GtkWidget *FindToolbar_entry_FindText; |
78 |
+- GtkWidget *FindToolbar_checkbutton_FindFiles; |
79 |
+- GtkWidget *FindToolbar_checkbutton_TrackInformation; |
80 |
++ extern GtkWidget *FindToolbar_entry_FindText; |
81 |
++ extern GtkWidget *FindToolbar_checkbutton_FindFiles; |
82 |
++ extern GtkWidget *FindToolbar_checkbutton_TrackInformation; |
83 |
+ |
84 |
+ /** |
85 |
+ * Add an individual file to the device. |
86 |
+@@ -329,77 +329,77 @@ |
87 |
+ int32_t displayAddTrackPlaylistDialog(gboolean showNew /* = TRUE */); |
88 |
+ |
89 |
+ // Widget for find toolbar |
90 |
+- GtkWidget *findToolbar; |
91 |
++ extern GtkWidget *findToolbar; |
92 |
+ |
93 |
+ // Parent container for the main toolbar. |
94 |
+- GtkWidget *handlebox1; |
95 |
+- GtkWidget *toolbarMain; |
96 |
++ extern GtkWidget *handlebox1; |
97 |
++ extern GtkWidget *toolbarMain; |
98 |
+ |
99 |
+ // Widgets for menu items; |
100 |
+- GtkWidget *fileConnect; |
101 |
+- GtkWidget *fileAdd; |
102 |
+- GtkWidget *fileDownload; |
103 |
+- GtkWidget *fileRemove; |
104 |
+- GtkWidget *fileRename; |
105 |
+- GtkWidget *fileMove; |
106 |
+- GtkWidget *fileNewFolder; |
107 |
+- GtkWidget *fileRemoveFolder; |
108 |
+- GtkWidget *fileRescan; |
109 |
+- GtkWidget *editDeviceName; |
110 |
+- GtkWidget *editFormatDevice; |
111 |
+- GtkWidget *editAddAlbumArt; |
112 |
+- GtkWidget *editFind; |
113 |
+- GtkWidget *editSelectAll; |
114 |
+- GtkWidget *contextMenu; |
115 |
+- GtkWidget *contextMenuColumn; |
116 |
+- GtkWidget *contestMenuFolder; |
117 |
+- GtkWidget* cfileAdd; |
118 |
+- GtkWidget* cfileNewFolder; |
119 |
+- GtkWidget *toolbuttonAddFile; |
120 |
++ extern GtkWidget *fileConnect; |
121 |
++ extern GtkWidget *fileAdd; |
122 |
++ extern GtkWidget *fileDownload; |
123 |
++ extern GtkWidget *fileRemove; |
124 |
++ extern GtkWidget *fileRename; |
125 |
++ extern GtkWidget *fileMove; |
126 |
++ extern GtkWidget *fileNewFolder; |
127 |
++ extern GtkWidget *fileRemoveFolder; |
128 |
++ extern GtkWidget *fileRescan; |
129 |
++ extern GtkWidget *editDeviceName; |
130 |
++ extern GtkWidget *editFormatDevice; |
131 |
++ extern GtkWidget *editAddAlbumArt; |
132 |
++ extern GtkWidget *editFind; |
133 |
++ extern GtkWidget *editSelectAll; |
134 |
++ extern GtkWidget *contextMenu; |
135 |
++ extern GtkWidget *contextMenuColumn; |
136 |
++ extern GtkWidget *contestMenuFolder; |
137 |
++ extern GtkWidget* cfileAdd; |
138 |
++ extern GtkWidget* cfileNewFolder; |
139 |
++ extern GtkWidget *toolbuttonAddFile; |
140 |
+ #if HAVE_GTK3 == 0 |
141 |
+- GtkTooltips *tooltipsToolbar; |
142 |
++ extern GtkTooltips *tooltipsToolbar; |
143 |
+ #endif |
144 |
+ |
145 |
+ // Columns in main file view; |
146 |
+- GtkTreeViewColumn *column_Size; |
147 |
+- GtkTreeViewColumn *column_Type; |
148 |
+- GtkTreeViewColumn *column_Track_Number; |
149 |
+- GtkTreeViewColumn *column_Title; |
150 |
+- GtkTreeViewColumn *column_Artist; |
151 |
+- GtkTreeViewColumn *column_Album; |
152 |
+- GtkTreeViewColumn *column_Year; |
153 |
+- GtkTreeViewColumn *column_Genre; |
154 |
+- GtkTreeViewColumn *column_Duration; |
155 |
+- GtkTreeViewColumn *column_Location; |
156 |
++ extern GtkTreeViewColumn *column_Size; |
157 |
++ extern GtkTreeViewColumn *column_Type; |
158 |
++ extern GtkTreeViewColumn *column_Track_Number; |
159 |
++ extern GtkTreeViewColumn *column_Title; |
160 |
++ extern GtkTreeViewColumn *column_Artist; |
161 |
++ extern GtkTreeViewColumn *column_Album; |
162 |
++ extern GtkTreeViewColumn *column_Year; |
163 |
++ extern GtkTreeViewColumn *column_Genre; |
164 |
++ extern GtkTreeViewColumn *column_Duration; |
165 |
++ extern GtkTreeViewColumn *column_Location; |
166 |
+ |
167 |
+ // Main menu widgets |
168 |
+- GtkWidget *menu_view_filesize; |
169 |
+- GtkWidget *menu_view_filetype; |
170 |
+- GtkWidget *menu_view_track_number; |
171 |
+- GtkWidget *menu_view_title; |
172 |
+- GtkWidget *menu_view_artist; |
173 |
+- GtkWidget *menu_view_album; |
174 |
+- GtkWidget *menu_view_year; |
175 |
+- GtkWidget *menu_view_genre; |
176 |
+- GtkWidget *menu_view_duration; |
177 |
+- GtkWidget *menu_view_folders; |
178 |
+- GtkWidget *menu_view_toolbar; |
179 |
++ extern GtkWidget *menu_view_filesize; |
180 |
++ extern GtkWidget *menu_view_filetype; |
181 |
++ extern GtkWidget *menu_view_track_number; |
182 |
++ extern GtkWidget *menu_view_title; |
183 |
++ extern GtkWidget *menu_view_artist; |
184 |
++ extern GtkWidget *menu_view_album; |
185 |
++ extern GtkWidget *menu_view_year; |
186 |
++ extern GtkWidget *menu_view_genre; |
187 |
++ extern GtkWidget *menu_view_duration; |
188 |
++ extern GtkWidget *menu_view_folders; |
189 |
++ extern GtkWidget *menu_view_toolbar; |
190 |
+ |
191 |
+ // Column view context menu; |
192 |
+- GtkWidget* cViewSize; |
193 |
+- GtkWidget* cViewType; |
194 |
+- GtkWidget* cViewTrackName; |
195 |
+- GtkWidget* cViewTrackNumber; |
196 |
+- GtkWidget* cViewArtist; |
197 |
+- GtkWidget* cViewAlbum; |
198 |
+- GtkWidget* cViewYear; |
199 |
+- GtkWidget* cViewGenre; |
200 |
+- GtkWidget* cViewDuration; |
201 |
++ extern GtkWidget* cViewSize; |
202 |
++ extern GtkWidget* cViewType; |
203 |
++ extern GtkWidget* cViewTrackName; |
204 |
++ extern GtkWidget* cViewTrackNumber; |
205 |
++ extern GtkWidget* cViewArtist; |
206 |
++ extern GtkWidget* cViewAlbum; |
207 |
++ extern GtkWidget* cViewYear; |
208 |
++ extern GtkWidget* cViewGenre; |
209 |
++ extern GtkWidget* cViewDuration; |
210 |
+ |
211 |
+ // Combobox used in AddTrackPlaylist feature. |
212 |
+- GtkWidget *combobox_AddTrackPlaylist; |
213 |
++ extern GtkWidget *combobox_AddTrackPlaylist; |
214 |
+ |
215 |
+- int64_t fileMoveTargetFolder; |
216 |
++ extern int64_t fileMoveTargetFolder; |
217 |
+ |
218 |
+ #ifdef __cplusplus |
219 |
+ } |
220 |
+--- a/src/main.c |
221 |
++++ b/src/main.c |
222 |
+@@ -26,7 +26,6 @@ |
223 |
+ #include "mtp.h" |
224 |
+ |
225 |
+ // Global Widgets needed by various functions. |
226 |
+-GtkWidget *windowMain; |
227 |
+ GtkWidget *windowStatusBar; |
228 |
+ GtkWidget *toolbuttonConnect; |
229 |
+ GtkWidget *treeviewFiles; |
230 |
+--- a/src/main.h |
231 |
++++ b/src/main.h |
232 |
+@@ -68,46 +68,46 @@ |
233 |
+ } Device_Struct; |
234 |
+ |
235 |
+ // Main Window Widgets. |
236 |
+- GtkWidget *windowMain; |
237 |
+- GtkWidget *scrolledwindowMain; |
238 |
++ extern GtkWidget *windowMain; |
239 |
++ extern GtkWidget *scrolledwindowMain; |
240 |
+ |
241 |
+- GtkWidget *windowStatusBar; |
242 |
+- GtkWidget *toolbuttonConnect; |
243 |
+- GtkWidget *treeviewFiles; |
244 |
+- GtkWidget *treeviewFolders; |
245 |
++ extern GtkWidget *windowStatusBar; |
246 |
++ extern GtkWidget *toolbuttonConnect; |
247 |
++ extern GtkWidget *treeviewFiles; |
248 |
++ extern GtkWidget *treeviewFolders; |
249 |
+ // Folder view; |
250 |
+- GtkWidget *scrolledwindowFolders; |
251 |
+- GtkTreeSelection *folderSelection; |
252 |
++ extern GtkWidget *scrolledwindowFolders; |
253 |
++ extern GtkTreeSelection *folderSelection; |
254 |
+ |
255 |
+ // Device information struct |
256 |
+- Device_Struct DeviceMgr; |
257 |
++ extern Device_Struct DeviceMgr; |
258 |
+ |
259 |
+ // File/Folder/Track/Playlist pointers |
260 |
+- LIBMTP_file_t *deviceFiles; |
261 |
+- LIBMTP_folder_t *deviceFolders; |
262 |
+- LIBMTP_track_t *deviceTracks; |
263 |
+- LIBMTP_playlist_t *devicePlayLists; |
264 |
+- uint32_t currentFolderID; // This is the ID of the current folder.... |
265 |
+- int32_t addTrackPlaylistID; |
266 |
++ extern LIBMTP_file_t *deviceFiles; |
267 |
++ extern LIBMTP_folder_t *deviceFolders; |
268 |
++ extern LIBMTP_track_t *deviceTracks; |
269 |
++ extern LIBMTP_playlist_t *devicePlayLists; |
270 |
++ extern uint32_t currentFolderID; // This is the ID of the current folder.... |
271 |
++ extern int32_t addTrackPlaylistID; |
272 |
+ |
273 |
+- GQueue *stackFolderIDs; |
274 |
+- GQueue *stackFolderNames; |
275 |
++ extern GQueue *stackFolderIDs; |
276 |
++ extern GQueue *stackFolderNames; |
277 |
+ |
278 |
+ // Icon file locations. |
279 |
+- gchar *file_logo_png; |
280 |
+- gchar *file_icon48_png; |
281 |
+- gchar *file_icon16_png; |
282 |
+- gchar *file_about_png; |
283 |
+- gchar *file_format_png; |
284 |
++ extern gchar *file_logo_png; |
285 |
++ extern gchar *file_icon48_png; |
286 |
++ extern gchar *file_icon16_png; |
287 |
++ extern gchar *file_about_png; |
288 |
++ extern gchar *file_format_png; |
289 |
+ // File view Icons |
290 |
+- gchar *file_audio_png; |
291 |
+- gchar *file_video_png; |
292 |
+- gchar *file_playlist_png; |
293 |
+- gchar *file_album_png; |
294 |
+- gchar *file_textfile_png; |
295 |
+- gchar *file_generic_png; |
296 |
+- gchar *file_folder_png; |
297 |
+- gchar *file_image_png; |
298 |
++ extern gchar *file_audio_png; |
299 |
++ extern gchar *file_video_png; |
300 |
++ extern gchar *file_playlist_png; |
301 |
++ extern gchar *file_album_png; |
302 |
++ extern gchar *file_textfile_png; |
303 |
++ extern gchar *file_generic_png; |
304 |
++ extern gchar *file_folder_png; |
305 |
++ extern gchar *file_image_png; |
306 |
+ |
307 |
+ /** |
308 |
+ * setFilePaths - set paths for image used within gMTP |
309 |
+--- a/src/mtp.h |
310 |
++++ b/src/mtp.h |
311 |
+@@ -42,7 +42,7 @@ |
312 |
+ |
313 |
+ #define MTP_DEVICE_SINGLE_STORAGE -1 |
314 |
+ |
315 |
+- gboolean AlbumErrorIgnore; |
316 |
++ extern gboolean AlbumErrorIgnore; |
317 |
+ |
318 |
+ typedef struct { |
319 |
+ gchar* file_extension; |
320 |
+--- a/src/preferences.h |
321 |
++++ b/src/preferences.h |
322 |
+@@ -28,22 +28,22 @@ |
323 |
+ #include <gtk/gtk.h> |
324 |
+ |
325 |
+ // Main preferences dialog if present. |
326 |
+- GtkWidget *windowPrefsDialog; |
327 |
++ extern GtkWidget *windowPrefsDialog; |
328 |
+ |
329 |
+ // Widgets for preferences buttons; |
330 |
+- GtkWidget *comboboxToolbarStyle; |
331 |
+- GtkWidget *checkbuttonDeviceConnect; |
332 |
+- GtkWidget *entryDownloadPath; |
333 |
+- GtkWidget *entryUploadPath; |
334 |
+- GtkWidget *checkbuttonDownloadPath; |
335 |
+- GtkWidget *checkbuttonConfirmFileOp; |
336 |
+- GtkWidget *checkbuttonConfirmOverWriteFileOp; |
337 |
+- GtkWidget *checkbuttonAutoAddTrackPlaylist; |
338 |
+- GtkWidget *checkbuttonIgnorePathInPlaylist; |
339 |
+- GtkWidget *checkbuttonSuppressAlbumErrors; |
340 |
+- GtkWidget *checkbuttonAltAccessMethod; |
341 |
+- GtkWidget *checkbuttonAllMediaAsFiles; |
342 |
+- GtkWidget *checkbuttonRetainTimeStamp; |
343 |
++ extern GtkWidget *comboboxToolbarStyle; |
344 |
++ extern GtkWidget *checkbuttonDeviceConnect; |
345 |
++ extern GtkWidget *entryDownloadPath; |
346 |
++ extern GtkWidget *entryUploadPath; |
347 |
++ extern GtkWidget *checkbuttonDownloadPath; |
348 |
++ extern GtkWidget *checkbuttonConfirmFileOp; |
349 |
++ extern GtkWidget *checkbuttonConfirmOverWriteFileOp; |
350 |
++ extern GtkWidget *checkbuttonAutoAddTrackPlaylist; |
351 |
++ extern GtkWidget *checkbuttonIgnorePathInPlaylist; |
352 |
++ extern GtkWidget *checkbuttonSuppressAlbumErrors; |
353 |
++ extern GtkWidget *checkbuttonAltAccessMethod; |
354 |
++ extern GtkWidget *checkbuttonAllMediaAsFiles; |
355 |
++ extern GtkWidget *checkbuttonRetainTimeStamp; |
356 |
+ |
357 |
+ /** |
358 |
+ * Callback to show the Preferences Dialog Box. |
359 |
+--- a/src/prefs.h |
360 |
++++ b/src/prefs.h |
361 |
+@@ -61,7 +61,7 @@ |
362 |
+ gboolean retain_timestamp; |
363 |
+ } Preferences_Struct; |
364 |
+ |
365 |
+- Preferences_Struct Preferences; |
366 |
++ extern Preferences_Struct Preferences; |
367 |
+ |
368 |
+ /** |
369 |
+ * Set some default values for the application prefences. |
370 |
+@@ -80,7 +80,7 @@ |
371 |
+ gboolean savePreferences(); |
372 |
+ |
373 |
+ #if HAVE_GTK3 == 0 |
374 |
+- GConfClient *gconfconnect; |
375 |
++ extern GConfClient *gconfconnect; |
376 |
+ /** |
377 |
+ * The callback function for GConf. |
378 |
+ * @param client |
379 |
+@@ -90,7 +90,7 @@ |
380 |
+ */ |
381 |
+ void gconf_callback_func(GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data); |
382 |
+ #else |
383 |
+- GSettings *gsettings_connect; |
384 |
++ extern GSettings *gsettings_connect; |
385 |
+ /** |
386 |
+ * The callback for the GSettings database. |
387 |
+ */ |
388 |
+--- a/src/progress.h |
389 |
++++ b/src/progress.h |
390 |
+@@ -27,7 +27,7 @@ |
391 |
+ #include <gtk/gtk.h> |
392 |
+ #include <stdint.h> |
393 |
+ |
394 |
+- gboolean progressDialog_killed; |
395 |
++ extern gboolean progressDialog_killed; |
396 |
+ |
397 |
+ /** |
398 |
+ * Create a Upload/Download Progress Window. |
399 |
|
400 |
diff --git a/media-sound/gmtp/gmtp-1.3.11.ebuild b/media-sound/gmtp/gmtp-1.3.11.ebuild |
401 |
index e510d3fc03e..0565860ce4e 100644 |
402 |
--- a/media-sound/gmtp/gmtp-1.3.11.ebuild |
403 |
+++ b/media-sound/gmtp/gmtp-1.3.11.ebuild |
404 |
@@ -1,7 +1,8 @@ |
405 |
-# Copyright 1999-2017 Gentoo Foundation |
406 |
+# Copyright 1999-2020 Gentoo Authors |
407 |
# Distributed under the terms of the GNU General Public License v2 |
408 |
|
409 |
-EAPI=6 |
410 |
+EAPI=7 |
411 |
+ |
412 |
inherit gnome2-utils |
413 |
|
414 |
DESCRIPTION="A simple MTP client for MP3 players" |
415 |
@@ -11,18 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
416 |
LICENSE="BSD" |
417 |
SLOT="0" |
418 |
KEYWORDS="~amd64 ~x86" |
419 |
-IUSE="" |
420 |
|
421 |
-RDEPEND="dev-libs/glib:2 |
422 |
+RDEPEND=" |
423 |
+ dev-libs/glib:2 |
424 |
media-libs/flac |
425 |
media-libs/libid3tag |
426 |
media-libs/libmtp |
427 |
media-libs/libvorbis |
428 |
x11-libs/gtk+:3" |
429 |
-DEPEND="${RDEPEND} |
430 |
+DEPEND="${RDEPEND}" |
431 |
+BDPEND=" |
432 |
sys-devel/gettext |
433 |
virtual/pkgconfig" |
434 |
|
435 |
+PATCHES=( "${FILESDIR}"/${PN}-1.3.11-fno-common.patch ) |
436 |
+ |
437 |
src_configure() { |
438 |
econf --with-gtk3 |
439 |
} |