summaryrefslogtreecommitdiff
path: root/media-sound/gmtp
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/gmtp')
-rw-r--r--media-sound/gmtp/Manifest5
-rw-r--r--media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch375
-rw-r--r--media-sound/gmtp/gmtp-1.3.10.ebuild43
-rw-r--r--media-sound/gmtp/gmtp-1.3.11.ebuild14
4 files changed, 386 insertions, 51 deletions
diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest
index 1a0db2847e00..89393ce6517b 100644
--- a/media-sound/gmtp/Manifest
+++ b/media-sound/gmtp/Manifest
@@ -1,5 +1,4 @@
-DIST gmtp-1.3.10.tar.gz 496912 BLAKE2B 52c31e74dca1a29c2a5627fa977ea040973ba2db5ce31dd123f88289e1a8197a51086e08ab5bdd029ea153388d5216a5483300c505ee06467f8b20b91446f798 SHA512 e2f5b8231e409d9ef6e512cb37199ce7771b87f61cb5bf29a86be0e3fdda22688005ae5b22f004f91a69df2f682c9eb0f1b7613e4f1a8dd3cc6fb0edb6e29fcd
+AUX gmtp-1.3.11-fno-common.patch 11945 BLAKE2B 7a8f75b3780f9e8f4dfd0e9c5be29f21f261b4baf95a9a543db9c73d3bebdff485734eb009e4a4edd1079e4f6410051d0b3f651d9996b788a108f44257e4b915 SHA512 0350366fe1abf48f0929351c12b2d891fcf874df29d327f8b8926538efd8263b402371f11ecc77c4a23d6cf12bf6ce7a3bfecdb518115fe48304028d30fe4870
DIST gmtp-1.3.11.tar.gz 498198 BLAKE2B 870f27712425328febcda0899b821bc5c8324c07bca50d7bf9f2bd78849e1f73968da4f5c2860e154d19c16ea184cd6a1715f198347356734dd815d7d2aca780 SHA512 af6e56136c227818aab19f9eb0a0ad9f1356b24e8a8aa44d600326d632bfcb0dc2794a7c28809f2de2016a52045c1cc5c2bdae0391a0a970ea04e947f920bc95
-EBUILD gmtp-1.3.10.ebuild 755 BLAKE2B 102b02335f00209a31ba0a24cd83e94b509fa3b42a14598b44b3ad5b3d8c36f1791991bf5ac0dd736197f9c1c7a77d71e2fae1b8624ada936291641c0e3d705d SHA512 85d109eaeea3fdf24d83f87c451d3a9c8e970d131f6affc63f2f7b274aa6de036fbfe13e32e06f8f37d7b4bfac79c1b2db1f255d6fd02d54defae7a9f126c2f1
-EBUILD gmtp-1.3.11.ebuild 755 BLAKE2B f149ed4df2b8571f5e0e207ef3e57b3e9ab6f3f4fd05f0c7ad9134dc37a7fed75f462590f0e7befa229a1bd76813c53fb7e0920b982a05f313f4df5ac07ffe97 SHA512 6b9e78190a737b7635c4163d3c7667b53c9e6559dba2724fad1c88eae83c414b284c78795621ad77bd2f496a9095122b9be9164d709fc100e9429508db618c01
+EBUILD gmtp-1.3.11.ebuild 814 BLAKE2B c9efebe5fe60f5df2d621ddd63ba14a3a3108e55c6bb8fae8081f0f44359a8206436209c82cd4180ab02e7db2ffb5d11acc8a196bff76fc5571b618b3befe365 SHA512 e05e336ead2b83b5efcd4d94facbe6be61e79629552a0fac6355610c97db42d79c0d404f4da20b823a259baa4dacd73cff14ef1d9deccf1eb78330a7d760250d
MISC metadata.xml 506 BLAKE2B 84107fa98c343254e61b433946b77be39abb9975736672bad91c9b61831f073aa3402046b946fa56dcab49413d4937480f36586ddcd9dfe8ecae23c09a0ae306 SHA512 ad86ce322da7b9459e597a94d03de3e3ec81d072646bf9fa98a4ad31e904f584c6a70cb82aaf7ec00feeca503818452109fc80cb9eebdff781b701ada830dac5
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
new file mode 100644
index 000000000000..e75d8130dc23
--- /dev/null
+++ b/media-sound/gmtp/files/gmtp-1.3.11-fno-common.patch
@@ -0,0 +1,375 @@
+--- a/src/dnd.h
++++ b/src/dnd.h
+@@ -35,7 +35,7 @@
+ };
+
+ /* Drag data format listing for gtk_drag_dest_set() */
+- GtkTargetEntry _gmtp_drop_types[3];
++ extern GtkTargetEntry _gmtp_drop_types[3];
+
+ #define gmtp_drag_dest_set(widget) gtk_drag_dest_set(widget, \
+ GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, \
+--- a/src/interface.h
++++ b/src/interface.h
+@@ -108,12 +108,12 @@
+ };
+
+ // Main Window widgets
+- GtkListStore *fileList;
+- GtkTreeStore *folderList;
+- GtkTreeSelection *fileSelection;
+- GtkTreeSelection *folderSelection;
+- gulong folderSelectHandler;
+- gulong fileSelectHandler;
++ extern GtkListStore *fileList;
++ extern GtkTreeStore *folderList;
++ extern GtkTreeSelection *fileSelection;
++ extern GtkTreeSelection *folderSelection;
++ extern gulong folderSelectHandler;
++ extern gulong fileSelectHandler;
+
+
+ /**
+@@ -252,22 +252,22 @@
+ void __fileMove(GtkTreeRowReference *Row);
+
+ // Flags for overwriting files of host PC and device.
+- gint fileoverwriteop;
++ extern gint fileoverwriteop;
+ // Flag to allow overwrite of files on device.
+- gint deviceoverwriteop;
++ extern gint deviceoverwriteop;
+
+ // Find options and variables.
+- gboolean inFindMode;
+- GSList *searchList;
++ extern gboolean inFindMode;
++ extern GSList *searchList;
+
+ /**
+ * Destroys a file listing object.
+ * @param file - pointer to the FileListStruc object.
+ */
+ void g_free_search(FileListStruc *file);
+- GtkWidget *FindToolbar_entry_FindText;
+- GtkWidget *FindToolbar_checkbutton_FindFiles;
+- GtkWidget *FindToolbar_checkbutton_TrackInformation;
++ extern GtkWidget *FindToolbar_entry_FindText;
++ extern GtkWidget *FindToolbar_checkbutton_FindFiles;
++ extern GtkWidget *FindToolbar_checkbutton_TrackInformation;
+
+ /**
+ * Add an individual file to the device.
+@@ -329,77 +329,77 @@
+ int32_t displayAddTrackPlaylistDialog(gboolean showNew /* = TRUE */);
+
+ // Widget for find toolbar
+- GtkWidget *findToolbar;
++ extern GtkWidget *findToolbar;
+
+ // Parent container for the main toolbar.
+- GtkWidget *handlebox1;
+- GtkWidget *toolbarMain;
++ extern GtkWidget *handlebox1;
++ extern GtkWidget *toolbarMain;
+
+ // Widgets for menu items;
+- GtkWidget *fileConnect;
+- GtkWidget *fileAdd;
+- GtkWidget *fileDownload;
+- GtkWidget *fileRemove;
+- GtkWidget *fileRename;
+- GtkWidget *fileMove;
+- GtkWidget *fileNewFolder;
+- GtkWidget *fileRemoveFolder;
+- GtkWidget *fileRescan;
+- GtkWidget *editDeviceName;
+- GtkWidget *editFormatDevice;
+- GtkWidget *editAddAlbumArt;
+- GtkWidget *editFind;
+- GtkWidget *editSelectAll;
+- GtkWidget *contextMenu;
+- GtkWidget *contextMenuColumn;
+- GtkWidget *contestMenuFolder;
+- GtkWidget* cfileAdd;
+- GtkWidget* cfileNewFolder;
+- GtkWidget *toolbuttonAddFile;
++ extern GtkWidget *fileConnect;
++ extern GtkWidget *fileAdd;
++ extern GtkWidget *fileDownload;
++ extern GtkWidget *fileRemove;
++ extern GtkWidget *fileRename;
++ extern GtkWidget *fileMove;
++ extern GtkWidget *fileNewFolder;
++ extern GtkWidget *fileRemoveFolder;
++ extern GtkWidget *fileRescan;
++ extern GtkWidget *editDeviceName;
++ extern GtkWidget *editFormatDevice;
++ extern GtkWidget *editAddAlbumArt;
++ extern GtkWidget *editFind;
++ extern GtkWidget *editSelectAll;
++ extern GtkWidget *contextMenu;
++ extern GtkWidget *contextMenuColumn;
++ extern GtkWidget *contestMenuFolder;
++ extern GtkWidget* cfileAdd;
++ extern GtkWidget* cfileNewFolder;
++ extern GtkWidget *toolbuttonAddFile;
+ #if HAVE_GTK3 == 0
+- GtkTooltips *tooltipsToolbar;
++ extern GtkTooltips *tooltipsToolbar;
+ #endif
+
+ // Columns in main file view;
+- GtkTreeViewColumn *column_Size;
+- GtkTreeViewColumn *column_Type;
+- GtkTreeViewColumn *column_Track_Number;
+- GtkTreeViewColumn *column_Title;
+- GtkTreeViewColumn *column_Artist;
+- GtkTreeViewColumn *column_Album;
+- GtkTreeViewColumn *column_Year;
+- GtkTreeViewColumn *column_Genre;
+- GtkTreeViewColumn *column_Duration;
+- GtkTreeViewColumn *column_Location;
++ extern GtkTreeViewColumn *column_Size;
++ extern GtkTreeViewColumn *column_Type;
++ extern GtkTreeViewColumn *column_Track_Number;
++ extern GtkTreeViewColumn *column_Title;
++ extern GtkTreeViewColumn *column_Artist;
++ extern GtkTreeViewColumn *column_Album;
++ extern GtkTreeViewColumn *column_Year;
++ extern GtkTreeViewColumn *column_Genre;
++ extern GtkTreeViewColumn *column_Duration;
++ extern GtkTreeViewColumn *column_Location;
+
+ // Main menu widgets
+- GtkWidget *menu_view_filesize;
+- GtkWidget *menu_view_filetype;
+- GtkWidget *menu_view_track_number;
+- GtkWidget *menu_view_title;
+- GtkWidget *menu_view_artist;
+- GtkWidget *menu_view_album;
+- GtkWidget *menu_view_year;
+- GtkWidget *menu_view_genre;
+- GtkWidget *menu_view_duration;
+- GtkWidget *menu_view_folders;
+- GtkWidget *menu_view_toolbar;
++ extern GtkWidget *menu_view_filesize;
++ extern GtkWidget *menu_view_filetype;
++ extern GtkWidget *menu_view_track_number;
++ extern GtkWidget *menu_view_title;
++ extern GtkWidget *menu_view_artist;
++ extern GtkWidget *menu_view_album;
++ extern GtkWidget *menu_view_year;
++ extern GtkWidget *menu_view_genre;
++ extern GtkWidget *menu_view_duration;
++ extern GtkWidget *menu_view_folders;
++ extern GtkWidget *menu_view_toolbar;
+
+ // Column view context menu;
+- GtkWidget* cViewSize;
+- GtkWidget* cViewType;
+- GtkWidget* cViewTrackName;
+- GtkWidget* cViewTrackNumber;
+- GtkWidget* cViewArtist;
+- GtkWidget* cViewAlbum;
+- GtkWidget* cViewYear;
+- GtkWidget* cViewGenre;
+- GtkWidget* cViewDuration;
++ extern GtkWidget* cViewSize;
++ extern GtkWidget* cViewType;
++ extern GtkWidget* cViewTrackName;
++ extern GtkWidget* cViewTrackNumber;
++ extern GtkWidget* cViewArtist;
++ extern GtkWidget* cViewAlbum;
++ extern GtkWidget* cViewYear;
++ extern GtkWidget* cViewGenre;
++ extern GtkWidget* cViewDuration;
+
+ // Combobox used in AddTrackPlaylist feature.
+- GtkWidget *combobox_AddTrackPlaylist;
++ extern GtkWidget *combobox_AddTrackPlaylist;
+
+- int64_t fileMoveTargetFolder;
++ extern int64_t fileMoveTargetFolder;
+
+ #ifdef __cplusplus
+ }
+--- a/src/main.c
++++ b/src/main.c
+@@ -26,7 +26,6 @@
+ #include "mtp.h"
+
+ // Global Widgets needed by various functions.
+-GtkWidget *windowMain;
+ GtkWidget *windowStatusBar;
+ GtkWidget *toolbuttonConnect;
+ GtkWidget *treeviewFiles;
+--- a/src/main.h
++++ b/src/main.h
+@@ -68,46 +68,46 @@
+ } Device_Struct;
+
+ // Main Window Widgets.
+- GtkWidget *windowMain;
+- GtkWidget *scrolledwindowMain;
++ extern GtkWidget *windowMain;
++ extern GtkWidget *scrolledwindowMain;
+
+- GtkWidget *windowStatusBar;
+- GtkWidget *toolbuttonConnect;
+- GtkWidget *treeviewFiles;
+- GtkWidget *treeviewFolders;
++ extern GtkWidget *windowStatusBar;
++ extern GtkWidget *toolbuttonConnect;
++ extern GtkWidget *treeviewFiles;
++ extern GtkWidget *treeviewFolders;
+ // Folder view;
+- GtkWidget *scrolledwindowFolders;
+- GtkTreeSelection *folderSelection;
++ extern GtkWidget *scrolledwindowFolders;
++ extern GtkTreeSelection *folderSelection;
+
+ // Device information struct
+- Device_Struct DeviceMgr;
++ extern Device_Struct DeviceMgr;
+
+ // File/Folder/Track/Playlist pointers
+- LIBMTP_file_t *deviceFiles;
+- LIBMTP_folder_t *deviceFolders;
+- LIBMTP_track_t *deviceTracks;
+- LIBMTP_playlist_t *devicePlayLists;
+- uint32_t currentFolderID; // This is the ID of the current folder....
+- int32_t addTrackPlaylistID;
++ extern LIBMTP_file_t *deviceFiles;
++ extern LIBMTP_folder_t *deviceFolders;
++ extern LIBMTP_track_t *deviceTracks;
++ extern LIBMTP_playlist_t *devicePlayLists;
++ extern uint32_t currentFolderID; // This is the ID of the current folder....
++ extern int32_t addTrackPlaylistID;
+
+- GQueue *stackFolderIDs;
+- GQueue *stackFolderNames;
++ extern GQueue *stackFolderIDs;
++ extern GQueue *stackFolderNames;
+
+ // Icon file locations.
+- gchar *file_logo_png;
+- gchar *file_icon48_png;
+- gchar *file_icon16_png;
+- gchar *file_about_png;
+- gchar *file_format_png;
++ extern gchar *file_logo_png;
++ extern gchar *file_icon48_png;
++ extern gchar *file_icon16_png;
++ extern gchar *file_about_png;
++ extern gchar *file_format_png;
+ // File view Icons
+- gchar *file_audio_png;
+- gchar *file_video_png;
+- gchar *file_playlist_png;
+- gchar *file_album_png;
+- gchar *file_textfile_png;
+- gchar *file_generic_png;
+- gchar *file_folder_png;
+- gchar *file_image_png;
++ extern gchar *file_audio_png;
++ extern gchar *file_video_png;
++ extern gchar *file_playlist_png;
++ extern gchar *file_album_png;
++ extern gchar *file_textfile_png;
++ extern gchar *file_generic_png;
++ extern gchar *file_folder_png;
++ extern gchar *file_image_png;
+
+ /**
+ * setFilePaths - set paths for image used within gMTP
+--- a/src/mtp.h
++++ b/src/mtp.h
+@@ -42,7 +42,7 @@
+
+ #define MTP_DEVICE_SINGLE_STORAGE -1
+
+- gboolean AlbumErrorIgnore;
++ extern gboolean AlbumErrorIgnore;
+
+ typedef struct {
+ gchar* file_extension;
+--- a/src/preferences.h
++++ b/src/preferences.h
+@@ -28,22 +28,22 @@
+ #include <gtk/gtk.h>
+
+ // Main preferences dialog if present.
+- GtkWidget *windowPrefsDialog;
++ extern GtkWidget *windowPrefsDialog;
+
+ // Widgets for preferences buttons;
+- GtkWidget *comboboxToolbarStyle;
+- GtkWidget *checkbuttonDeviceConnect;
+- GtkWidget *entryDownloadPath;
+- GtkWidget *entryUploadPath;
+- GtkWidget *checkbuttonDownloadPath;
+- GtkWidget *checkbuttonConfirmFileOp;
+- GtkWidget *checkbuttonConfirmOverWriteFileOp;
+- GtkWidget *checkbuttonAutoAddTrackPlaylist;
+- GtkWidget *checkbuttonIgnorePathInPlaylist;
+- GtkWidget *checkbuttonSuppressAlbumErrors;
+- GtkWidget *checkbuttonAltAccessMethod;
+- GtkWidget *checkbuttonAllMediaAsFiles;
+- GtkWidget *checkbuttonRetainTimeStamp;
++ extern GtkWidget *comboboxToolbarStyle;
++ extern GtkWidget *checkbuttonDeviceConnect;
++ extern GtkWidget *entryDownloadPath;
++ extern GtkWidget *entryUploadPath;
++ extern GtkWidget *checkbuttonDownloadPath;
++ extern GtkWidget *checkbuttonConfirmFileOp;
++ extern GtkWidget *checkbuttonConfirmOverWriteFileOp;
++ extern GtkWidget *checkbuttonAutoAddTrackPlaylist;
++ extern GtkWidget *checkbuttonIgnorePathInPlaylist;
++ extern GtkWidget *checkbuttonSuppressAlbumErrors;
++ extern GtkWidget *checkbuttonAltAccessMethod;
++ extern GtkWidget *checkbuttonAllMediaAsFiles;
++ extern GtkWidget *checkbuttonRetainTimeStamp;
+
+ /**
+ * Callback to show the Preferences Dialog Box.
+--- a/src/prefs.h
++++ b/src/prefs.h
+@@ -61,7 +61,7 @@
+ gboolean retain_timestamp;
+ } Preferences_Struct;
+
+- Preferences_Struct Preferences;
++ extern Preferences_Struct Preferences;
+
+ /**
+ * Set some default values for the application prefences.
+@@ -80,7 +80,7 @@
+ gboolean savePreferences();
+
+ #if HAVE_GTK3 == 0
+- GConfClient *gconfconnect;
++ extern GConfClient *gconfconnect;
+ /**
+ * The callback function for GConf.
+ * @param client
+@@ -90,7 +90,7 @@
+ */
+ void gconf_callback_func(GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data);
+ #else
+- GSettings *gsettings_connect;
++ extern GSettings *gsettings_connect;
+ /**
+ * The callback for the GSettings database.
+ */
+--- a/src/progress.h
++++ b/src/progress.h
+@@ -27,7 +27,7 @@
+ #include <gtk/gtk.h>
+ #include <stdint.h>
+
+- gboolean progressDialog_killed;
++ extern gboolean progressDialog_killed;
+
+ /**
+ * Create a Upload/Download Progress Window.
diff --git a/media-sound/gmtp/gmtp-1.3.10.ebuild b/media-sound/gmtp/gmtp-1.3.10.ebuild
deleted file mode 100644
index 9f56fbc962a1..000000000000
--- a/media-sound/gmtp/gmtp-1.3.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2-utils
-
-DESCRIPTION="A simple MTP client for MP3 players"
-HOMEPAGE="http://gmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
- media-libs/flac
- media-libs/libid3tag
- media-libs/libmtp
- media-libs/libvorbis
- x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-src_configure() {
- econf --with-gtk3
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/media-sound/gmtp/gmtp-1.3.11.ebuild b/media-sound/gmtp/gmtp-1.3.11.ebuild
index e510d3fc03ef..0565860ce4e8 100644
--- a/media-sound/gmtp/gmtp-1.3.11.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.11.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit gnome2-utils
DESCRIPTION="A simple MTP client for MP3 players"
@@ -11,18 +12,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-libs/glib:2
+RDEPEND="
+ dev-libs/glib:2
media-libs/flac
media-libs/libid3tag
media-libs/libmtp
media-libs/libvorbis
x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDPEND="
sys-devel/gettext
virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${PN}-1.3.11-fno-common.patch )
+
src_configure() {
econf --with-gtk3
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 10:03:36 +0000