# HG changeset patch # User Aleksej Bobylev # Date 1528984000 -10800 # Node ID 7b0bad6d5a990b58b51f9df7f1112b767159b0c3 # Parent a06249bc3edef8bde87a3b276003fa5c1d6d3b8a gmtk, gnome-mplayer: provide both GTK2 and GTK3 support; remove marlin: project abandoned since 2013, compilation stops with errors, no patches available... diff -r a06249bc3ede -r 7b0bad6d5a99 gmtk/receipt --- a/gmtk/receipt Thu Jun 14 13:45:57 2018 +0300 +++ b/gmtk/receipt Thu Jun 14 16:46:40 2018 +0300 @@ -11,24 +11,77 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/kdekorte/gmtk/archive/v$VERSION.tar.gz" -BUILD_DEPENDS="gettext intltool xorg-libX11-dev gtk+-dev glib-dev GConf-dev \ -alsa-lib-dev pulseaudio-dev" -SPLIT="gmtk-dev" +BUILD_DEPENDS="gettext intltool xorg-libX11-dev gtk+3-dev gtk+-dev glib-dev \ +GConf-dev alsa-lib-dev pulseaudio-dev" +SPLIT="gmlib gmtk gmtk3 gmtk-dev" compile_rules() { - ./configure $CONFIGURE_ARGS && + # The goal of this tricky receipt is to provide different GTK2 and GTK3 + # libraries that can be installed at the same time not overwriting each + # other. + # Note, it is not enough to rename just *.so library file and symlinks, + # take care about SONAME field inside the library. + + # GTK+2 # + + ./configure \ + --disable-static \ + --disable-gtk3 \ + $CONFIGURE_ARGS && fix libtool && make && - make install + make install || return 1 + + # stash gmtk.pc + mv $install/usr/lib/pkgconfig/gmtk.pc $install/usr/lib/pkgconfig/gmtk.pc.save + + # GTK+3 # + + # libgmtk.so* -> libgmtk3.so* + sed -i "/^libname_spec='/s|name'$|{name}3'|" configure + make clean + ./configure \ + --disable-static \ + --enable-gtk3 \ + $CONFIGURE_ARGS && + fix libtool && + make && + make install || return 1 + + rm $install/usr/lib/libgmlib3.so* # the same as libgmlib.so* + + # make gmtk3.pc + mv $install/usr/lib/pkgconfig/gmtk.pc $install/usr/lib/pkgconfig/gmtk3.pc + sed -i 's|lgmtk|lgmtk3|' $install/usr/lib/pkgconfig/gmtk3.pc + # revert gmtk.pc + mv $install/usr/lib/pkgconfig/gmtk.pc.save $install/usr/lib/pkgconfig/gmtk.pc + + # CHECK # + + for i in libgmtk libgmtk3; do + echo $i: + readelf -a $install/usr/lib/$i.so.$VERSION | fgrep '(SONAME)' + done } genpkg_rules() { case $PACKAGE in + gmlib) + copy libgmlib.so* + DEPENDS="alsa-lib glib pulseaudio pulseaudio-glib" + CAT="libs|common library" + ;; gmtk) - copy @std - DEPENDS="alsa-lib cairo glib gtk+ pulseaudio pulseaudio-glib" + copy libgmtk.so* + DEPENDS="alsa-lib cairo glib gmlib gtk+ pulseaudio pulseaudio-glib" + CAT="libs|GTK2 libs" ;; - *-dev) + gmtk3) + copy libgmtk3.so* + DEPENDS="alsa-lib cairo glib gmlib gtk+3 pulseaudio pulseaudio-glib" + CAT="libs|GTK3 libs" + ;; + gmtk-dev) copy @dev ;; esac diff -r a06249bc3ede -r 7b0bad6d5a99 gnome-mplayer/receipt --- a/gnome-mplayer/receipt Thu Jun 14 13:45:57 2018 +0300 +++ b/gnome-mplayer/receipt Thu Jun 14 16:46:40 2018 +0300 @@ -3,7 +3,7 @@ PACKAGE="gnome-mplayer" VERSION="1.0.8" CATEGORY="multimedia" -SHORT_DESC="Gnome MPlayer is a GTK2/GTK3 interface for MPlayer" +SHORT_DESC="GNOME MPlayer is a GTK interface for MPlayer" MAINTAINER="jozee@slitaz.org" LICENSE="GPL2" WEB_SITE="https://code.google.com/archive/p/gnome-mplayer/" @@ -11,26 +11,47 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/$TARBALL" -BUILD_DEPENDS="mplayer alsa-lib libgpod dbus-dev dbus-glib-dev libnotify-dev \ -libgpod-dev xorg-libX11-dev xorg-libxcb-dev gtk+-dev xorg-libXScrnSaver-dev \ -gmtk-dev" +BUILD_DEPENDS="gettext xorg-libX11-dev gtk+3-dev gtk+-dev glib-dev gmtk-dev \ +dbus-dev dbus-glib-dev xorg-libXScrnSaver-dev alsa-lib-dev pulseaudio-dev \ +libnotify-dev libgpod-dev" +SPLIT="gnome-mplayer-gtk3:gtk3" compile_rules() { + case $SET in + '') + SET_ARGS='--disable-gtk3' + GMTK_LIBS='-lgmtk' + ;; + gtk3) + SET_ARGS='--enable-gtk3' + GMTK_LIBS='-lgmtk3' + ;; + esac + + GMTK_LIBS="$GMTK_LIBS" \ ./configure \ - --disable-schemas-install \ - --without-gconf \ --disable-nautilus \ - --disable-panscan \ - --without-libmusicbrainz3 && - make && - make install || return 1 - - sed 's|Exec=gnome-mplayer|Exec=gnome-mplayer %F|' \ - -i $install/usr/share/applications/$PACKAGE.desktop + --without-libmusicbrainz3 \ + $SET_ARGS \ + $CONFIGURE_ARGS && + make && + make install } genpkg_rules() { - copy @std - DEPENDS="mplayer gtk+ dbus-glib libnotify alsa-lib libgpod" + case $PACKAGE in + gnome-mplayer) + copy @std + DEPENDS="alsa-lib dbus dbus-glib gdk-pixbuf glib gmlib gmtk gtk+ \ + libgpod libnotify xorg-libX11 xorg-libXScrnSaver mplayer" + CAT="multimedia|with GTK2" + ;; + gnome-mplayer-gtk3) + copy @std + DEPENDS="alsa-lib cairo dbus dbus-glib gdk-pixbuf glib gmlib gmtk3 \ + gtk+3 libgpod libnotify xorg-libX11 xorg-libXScrnSaver mplayer" + CAT="multimedia|with GTK3" + ;; + esac TAGS="player audio video movie mp3 ogg dvd" } diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/.icon.png Binary file marlin/.icon.png has changed diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/receipt --- a/marlin/receipt Thu Jun 14 13:45:57 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -# SliTaz package receipt v2. - -PACKAGE="marlin" -VERSION="0.5" -CATEGORY="utilities" -SHORT_DESC="A sleek and fast GTK3 file manager" -MAINTAINER="al.bobylev@gmail.com" -LICENSE="GPL2 GPL3" -WEB_SITE="https://launchpad.net/marlin" - -BRANCH="879" -TARBALL="$PACKAGE-$BRANCH.tar.bz2" -WGET_URL="bzr|lp:marlin" - -BUILD_DEPENDS="bazaar cmake vala varka-dev gtk+3-dev libgee-dev sqlite3-dev \ -dbus-glib-dev libnotify-dev dconf-dev tumbler-dev ffmpegthumbnailer-dev \ -granite-dev gettext" -SPLIT="marlin-dev" - -compile_rules() { - # gee-1.0 is old while gee-0.8 is latest ;) - sed -i 's|gee-1.0|gee-0.8|g' $(grep -l gee-1.0 $(find . -type f)) - - sed -i 's/Gdk.EventKey event = Gdk.EventKey(/Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS/' libwidgets/tests/tests-pathbar.vala - sed -i 's/event\./&key./' libwidgets/tests/tests-pathbar.vala - sed -i 's/event)/event.key)/' libwidgets/tests/tests-pathbar.vala - - mkdir build && cd build && - cmake .. -DCMAKE_INSTALL_PREFIX=/usr && - make && - make DESTDIR=$install install -} - -genpkg_rules() { - case $PACKAGE in - marlin) - mkdir -p \ - $fs/usr/bin \ - $fs/usr/lib \ - $fs/usr/share/locale - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/marlin $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib - cp -a $install/usr/share/applications $fs/usr/share - cp -a $install/usr/share/dbus* $fs/usr/share - cp -a $install/usr/share/glib* $fs/usr/share - cp -a $install/usr/share/icons $fs/usr/share - cp -a $install/usr/share/marlin $fs/usr/share - cp -a $install/usr/share/pixmaps $fs/usr/share - - # localization - . $WOK/slitaz-i18n/stuff/locale-pack.conf - for lang in $LOCALE_PACK; do - langf=$install/usr/share/locale/$lang - [ -d $langf ] && cp -a $langf $fs/usr/share/locale - done - - # icons - mkdir -p $fs/usr/share/icons/hicolor/16x16 - cp -a $stuff/apps $fs/usr/share/icons/hicolor/16x16 - cp -a $stuff/marlin.png $fs/usr/share/pixmaps - DEPENDS="dbus-glib gtk+3 libgee libnotify libsqlite3 varka \ - dconf" - SUGGESTED="tumbler ffmpegthumbnailer granite extended-actions" - ;; - *-dev) - copy @dev - ;; - esac -} diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/apps/view-list-column.png Binary file marlin/stuff/apps/view-list-column.png has changed diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/apps/view-list-compact.png Binary file marlin/stuff/apps/view-list-compact.png has changed diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/apps/view-list-details.png Binary file marlin/stuff/apps/view-list-details.png has changed diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/apps/view-list-icons.png Binary file marlin/stuff/apps/view-list-icons.png has changed diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/marlin.png Binary file marlin/stuff/marlin.png has changed diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/patches/marlin-0.5.patch --- a/marlin/stuff/patches/marlin-0.5.patch Thu Jun 14 13:45:57 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -# discussion: https://aur.archlinux.org/packages/marlin-bzr/ -# patch found here: http://pastie.org/5189903 ---- marlin-0.5/src/fm-directory-view.h -+++ marlin-0.5/src/fm-directory-view.h -@@ -42,6 +42,7 @@ - typedef struct FMDirectoryView FMDirectoryView; - typedef struct FMDirectoryViewClass FMDirectoryViewClass; - -+#define FM_DIRECTORY_TYPE_VIEW fm_directory_view_get_type() - #define FM_TYPE_DIRECTORY_VIEW fm_directory_view_get_type() - #define FM_DIRECTORY_VIEW(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), FM_TYPE_DIRECTORY_VIEW, FMDirectoryView)) - ---- marlin-0.5/src/exo-icon-view.c -+++ marlin-0.5/src/exo-icon-view.c -@@ -4641,8 +4641,15 @@ - item = list ? list->data : NULL; - - /* Give focus to the first cell initially */ -- exo_icon_view_set_cell_data (icon_view, item); -- gtk_cell_area_focus (icon_view->priv->cell_area, direction); -+ if (item == NULL) -+ { -+ return; -+ } -+ else -+ { -+ exo_icon_view_set_cell_data (icon_view, item); -+ gtk_cell_area_focus (icon_view->priv->cell_area, direction); -+ } - } - else - { -@@ -4798,8 +4805,15 @@ - item = list ? list->data : NULL; - - /* Give focus to the first cell initially */ -- exo_icon_view_set_cell_data (icon_view, item); -- gtk_cell_area_focus (icon_view->priv->cell_area, direction); -+ if (item == NULL) -+ { -+ return; -+ } -+ else -+ { -+ exo_icon_view_set_cell_data (icon_view, item); -+ gtk_cell_area_focus (icon_view->priv->cell_area, direction); -+ } - } - else - { diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/patches/marlin-icons.patch --- a/marlin/stuff/patches/marlin-icons.patch Thu Jun 14 13:45:57 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ ---- marlin-0.5/src/View/Chrome/ViewSwicher.vala -+++ marlin-0.5/src/View/Chrome/ViewSwicher.vala -@@ -74,16 +74,16 @@ - - switcher = new ModeButton (); - -- icon = new Image.from_icon_name ("view-list-icons-symbolic", IconSize.MENU); -+ icon = new Image.from_icon_name ("view-list-icons", IconSize.MENU); - icon.set_tooltip_text (_("View as icons")); - switcher.append(icon); -- list = new Image.from_icon_name ("view-list-details-symbolic", IconSize.MENU); -+ list = new Image.from_icon_name ("view-list-details", IconSize.MENU); - list.set_tooltip_text (_("View as list")); - switcher.append(list); -- compact = new Image.from_icon_name ("view-list-compact-symbolic", IconSize.MENU); -+ compact = new Image.from_icon_name ("view-list-compact", IconSize.MENU); - compact.set_tooltip_text (_("View as compact list")); - switcher.append(compact); -- miller = new Image.from_icon_name ("view-list-column-symbolic", IconSize.MENU); -+ miller = new Image.from_icon_name ("view-list-column", IconSize.MENU); - miller.set_tooltip_text(_("View as column")); - switcher.append(miller); - ---- marlin-0.5/src/View/Window.vala -+++ marlin-0.5/src/View/Window.vala -@@ -703,13 +703,13 @@ - { "Redo", Stock.REDO, N_("_Redo"), - "Y", N_("Redo the last action"), - action_redo_callback }, -- { "Up", "go-up-symbolic", N_("Open _Parent"), -+ { "Up", "go-up", N_("Open _Parent"), - "Up", N_("Open the parent folder"), - action_go_up }, -- { "Back", "go-previous-symbolic", N_("_Back"), -+ { "Back", "go-previous", N_("_Back"), - "Left", N_("Go to the previous visited location"), - action_go_back }, -- { "Forward", "go-next-symbolic", N_("_Forward"), -+ { "Forward", "go-next", N_("_Forward"), - "Right", N_("Go to the next visited location"), - action_go_forward }, - { "Reload", Stock.REFRESH, N_("_Reload"), ---- marlin-0.5/src/View/LocationBar.vala -+++ marlin-0.5/src/View/LocationBar.vala -@@ -110,7 +110,7 @@ - dir = Environment.get_user_special_dir(UserDirectory.MUSIC); - if(dir.contains("/")) - { -- IconDirectory icon = {dir, "folder-music-symbolic", false, null, null, dir.split("/"), false, null}; -+ IconDirectory icon = {dir, "folder-music", false, null, null, dir.split("/"), false, null}; - icon.exploded[0] = "/"; - add_icon(icon); - } -@@ -119,7 +119,7 @@ - dir = Environment.get_user_special_dir(UserDirectory.PICTURES); - if(dir.contains("/")) - { -- IconDirectory icon = {dir, "folder-pictures-symbolic", false, null, null, dir.split("/"), false, null}; -+ IconDirectory icon = {dir, "folder-pictures", false, null, null, dir.split("/"), false, null}; - icon.exploded[0] = "/"; - add_icon(icon); - } -@@ -128,7 +128,7 @@ - dir = Environment.get_user_special_dir(UserDirectory.VIDEOS); - if(dir.contains("/")) - { -- IconDirectory icon = {dir, "folder-videos-symbolic", false, null, null, dir.split("/"), false, null}; -+ IconDirectory icon = {dir, "folder-videos", false, null, null, dir.split("/"), false, null}; - icon.exploded[0] = "/"; - add_icon(icon); - } -@@ -137,7 +137,7 @@ - dir = Environment.get_user_special_dir(UserDirectory.DOWNLOAD); - if(dir.contains("/")) - { -- IconDirectory icon = {dir, "folder-downloads-symbolic", false, null, null, dir.split("/"), false, null}; -+ IconDirectory icon = {dir, "folder-downloads", false, null, null, dir.split("/"), false, null}; - icon.exploded[0] = "/"; - add_icon(icon); - } -@@ -146,7 +146,7 @@ - dir = Environment.get_user_special_dir(UserDirectory.DOCUMENTS); - if(dir.contains("/")) - { -- IconDirectory icon = {dir, "folder-documents-symbolic", false, null, null, dir.split("/"), false, null}; -+ IconDirectory icon = {dir, "folder-documents", false, null, null, dir.split("/"), false, null}; - icon.exploded[0] = "/"; - add_icon(icon); - } -@@ -155,7 +155,7 @@ - dir = Environment.get_user_special_dir(UserDirectory.TEMPLATES); - if(dir.contains("/")) - { -- IconDirectory icon = {dir, "folder-templates-symbolic", false, null, null, dir.split("/"), false, null}; -+ IconDirectory icon = {dir, "folder-templates", false, null, null, dir.split("/"), false, null}; - icon.exploded[0] = "/"; - add_icon(icon); - } -@@ -163,7 +163,7 @@ - dir = Environment.get_home_dir(); - if(dir.contains("/")) - { -- IconDirectory icon = {dir, "go-home-symbolic", false, null, null, dir.split("/"), true, null}; -+ IconDirectory icon = {dir, "go-home", false, null, null, dir.split("/"), true, null}; - icon.exploded[0] = "/"; - add_icon(icon); - } ---- marlin-0.5/src/View/Chrome/TopMenu.vala -+++ marlin-0.5/src/View/Chrome/TopMenu.vala -@@ -43,7 +43,7 @@ - compact_menu = (Gtk.Menu) win.ui.get_widget("/CompactMenu"); - toolbar_menu = (Gtk.Menu) win.ui.get_widget("/ToolbarMenu"); - -- app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system-symbolic", IconSize.MENU), -+ app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system", IconSize.MENU), - null, _("Menu"), compact_menu); - setup_items(); - show(); ---- marlin-0.5/libwidgets/BreadcrumbsEntry.vala -+++ marlin-0.5/libwidgets/BreadcrumbsEntry.vala -@@ -74,7 +74,7 @@ - - /* Load arrow image */ - try { -- arrow_img = IconTheme.get_default ().load_icon ("go-jump-symbolic", 16, IconLookupFlags.GENERIC_FALLBACK); -+ arrow_img = IconTheme.get_default ().load_icon ("go-jump", 16, IconLookupFlags.GENERIC_FALLBACK); - } catch(Error err) { - stderr.printf ("Unable to load home icon: %s", err.message); - } diff -r a06249bc3ede -r 7b0bad6d5a99 marlin/stuff/patches/series --- a/marlin/stuff/patches/series Thu Jun 14 13:45:57 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ --p1|marlin-0.5.patch --p1|marlin-icons.patch