wok-next rev 20829
gmtk, gnome-mplayer: provide both GTK2 and GTK3 support; remove marlin: project abandoned since 2013, compilation stops with errors, no patches available...
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Jun 14 16:46:40 2018 +0300 (2018-06-14) |
| parents | a06249bc3ede |
| children | aa21a3403934 |
| files | gmtk/receipt gnome-mplayer/receipt marlin/.icon.png marlin/receipt marlin/stuff/apps/view-list-column.png marlin/stuff/apps/view-list-compact.png marlin/stuff/apps/view-list-details.png marlin/stuff/apps/view-list-icons.png marlin/stuff/marlin.png marlin/stuff/patches/marlin-0.5.patch marlin/stuff/patches/marlin-icons.patch marlin/stuff/patches/series |
line diff
1.1 --- a/gmtk/receipt Thu Jun 14 13:45:57 2018 +0300 1.2 +++ b/gmtk/receipt Thu Jun 14 16:46:40 2018 +0300 1.3 @@ -11,24 +11,77 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.5 WGET_URL="https://github.com/kdekorte/gmtk/archive/v$VERSION.tar.gz" 1.6 1.7 -BUILD_DEPENDS="gettext intltool xorg-libX11-dev gtk+-dev glib-dev GConf-dev \ 1.8 -alsa-lib-dev pulseaudio-dev" 1.9 -SPLIT="gmtk-dev" 1.10 +BUILD_DEPENDS="gettext intltool xorg-libX11-dev gtk+3-dev gtk+-dev glib-dev \ 1.11 +GConf-dev alsa-lib-dev pulseaudio-dev" 1.12 +SPLIT="gmlib gmtk gmtk3 gmtk-dev" 1.13 1.14 compile_rules() { 1.15 - ./configure $CONFIGURE_ARGS && 1.16 + # The goal of this tricky receipt is to provide different GTK2 and GTK3 1.17 + # libraries that can be installed at the same time not overwriting each 1.18 + # other. 1.19 + # Note, it is not enough to rename just *.so library file and symlinks, 1.20 + # take care about SONAME field inside the library. 1.21 + 1.22 + # GTK+2 # 1.23 + 1.24 + ./configure \ 1.25 + --disable-static \ 1.26 + --disable-gtk3 \ 1.27 + $CONFIGURE_ARGS && 1.28 fix libtool && 1.29 make && 1.30 - make install 1.31 + make install || return 1 1.32 + 1.33 + # stash gmtk.pc 1.34 + mv $install/usr/lib/pkgconfig/gmtk.pc $install/usr/lib/pkgconfig/gmtk.pc.save 1.35 + 1.36 + # GTK+3 # 1.37 + 1.38 + # libgmtk.so* -> libgmtk3.so* 1.39 + sed -i "/^libname_spec='/s|name'$|{name}3'|" configure 1.40 + make clean 1.41 + ./configure \ 1.42 + --disable-static \ 1.43 + --enable-gtk3 \ 1.44 + $CONFIGURE_ARGS && 1.45 + fix libtool && 1.46 + make && 1.47 + make install || return 1 1.48 + 1.49 + rm $install/usr/lib/libgmlib3.so* # the same as libgmlib.so* 1.50 + 1.51 + # make gmtk3.pc 1.52 + mv $install/usr/lib/pkgconfig/gmtk.pc $install/usr/lib/pkgconfig/gmtk3.pc 1.53 + sed -i 's|lgmtk|lgmtk3|' $install/usr/lib/pkgconfig/gmtk3.pc 1.54 + # revert gmtk.pc 1.55 + mv $install/usr/lib/pkgconfig/gmtk.pc.save $install/usr/lib/pkgconfig/gmtk.pc 1.56 + 1.57 + # CHECK # 1.58 + 1.59 + for i in libgmtk libgmtk3; do 1.60 + echo $i: 1.61 + readelf -a $install/usr/lib/$i.so.$VERSION | fgrep '(SONAME)' 1.62 + done 1.63 } 1.64 1.65 genpkg_rules() { 1.66 case $PACKAGE in 1.67 + gmlib) 1.68 + copy libgmlib.so* 1.69 + DEPENDS="alsa-lib glib pulseaudio pulseaudio-glib" 1.70 + CAT="libs|common library" 1.71 + ;; 1.72 gmtk) 1.73 - copy @std 1.74 - DEPENDS="alsa-lib cairo glib gtk+ pulseaudio pulseaudio-glib" 1.75 + copy libgmtk.so* 1.76 + DEPENDS="alsa-lib cairo glib gmlib gtk+ pulseaudio pulseaudio-glib" 1.77 + CAT="libs|GTK2 libs" 1.78 ;; 1.79 - *-dev) 1.80 + gmtk3) 1.81 + copy libgmtk3.so* 1.82 + DEPENDS="alsa-lib cairo glib gmlib gtk+3 pulseaudio pulseaudio-glib" 1.83 + CAT="libs|GTK3 libs" 1.84 + ;; 1.85 + gmtk-dev) 1.86 copy @dev 1.87 ;; 1.88 esac
2.1 --- a/gnome-mplayer/receipt Thu Jun 14 13:45:57 2018 +0300 2.2 +++ b/gnome-mplayer/receipt Thu Jun 14 16:46:40 2018 +0300 2.3 @@ -3,7 +3,7 @@ 2.4 PACKAGE="gnome-mplayer" 2.5 VERSION="1.0.8" 2.6 CATEGORY="multimedia" 2.7 -SHORT_DESC="Gnome MPlayer is a GTK2/GTK3 interface for MPlayer" 2.8 +SHORT_DESC="GNOME MPlayer is a GTK interface for MPlayer" 2.9 MAINTAINER="jozee@slitaz.org" 2.10 LICENSE="GPL2" 2.11 WEB_SITE="https://code.google.com/archive/p/gnome-mplayer/" 2.12 @@ -11,26 +11,47 @@ 2.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.14 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/$TARBALL" 2.15 2.16 -BUILD_DEPENDS="mplayer alsa-lib libgpod dbus-dev dbus-glib-dev libnotify-dev \ 2.17 -libgpod-dev xorg-libX11-dev xorg-libxcb-dev gtk+-dev xorg-libXScrnSaver-dev \ 2.18 -gmtk-dev" 2.19 +BUILD_DEPENDS="gettext xorg-libX11-dev gtk+3-dev gtk+-dev glib-dev gmtk-dev \ 2.20 +dbus-dev dbus-glib-dev xorg-libXScrnSaver-dev alsa-lib-dev pulseaudio-dev \ 2.21 +libnotify-dev libgpod-dev" 2.22 +SPLIT="gnome-mplayer-gtk3:gtk3" 2.23 2.24 compile_rules() { 2.25 + case $SET in 2.26 + '') 2.27 + SET_ARGS='--disable-gtk3' 2.28 + GMTK_LIBS='-lgmtk' 2.29 + ;; 2.30 + gtk3) 2.31 + SET_ARGS='--enable-gtk3' 2.32 + GMTK_LIBS='-lgmtk3' 2.33 + ;; 2.34 + esac 2.35 + 2.36 + GMTK_LIBS="$GMTK_LIBS" \ 2.37 ./configure \ 2.38 - --disable-schemas-install \ 2.39 - --without-gconf \ 2.40 --disable-nautilus \ 2.41 - --disable-panscan \ 2.42 - --without-libmusicbrainz3 && 2.43 - make && 2.44 - make install || return 1 2.45 - 2.46 - sed 's|Exec=gnome-mplayer|Exec=gnome-mplayer %F|' \ 2.47 - -i $install/usr/share/applications/$PACKAGE.desktop 2.48 + --without-libmusicbrainz3 \ 2.49 + $SET_ARGS \ 2.50 + $CONFIGURE_ARGS && 2.51 + make && 2.52 + make install 2.53 } 2.54 2.55 genpkg_rules() { 2.56 - copy @std 2.57 - DEPENDS="mplayer gtk+ dbus-glib libnotify alsa-lib libgpod" 2.58 + case $PACKAGE in 2.59 + gnome-mplayer) 2.60 + copy @std 2.61 + DEPENDS="alsa-lib dbus dbus-glib gdk-pixbuf glib gmlib gmtk gtk+ \ 2.62 + libgpod libnotify xorg-libX11 xorg-libXScrnSaver mplayer" 2.63 + CAT="multimedia|with GTK2" 2.64 + ;; 2.65 + gnome-mplayer-gtk3) 2.66 + copy @std 2.67 + DEPENDS="alsa-lib cairo dbus dbus-glib gdk-pixbuf glib gmlib gmtk3 \ 2.68 + gtk+3 libgpod libnotify xorg-libX11 xorg-libXScrnSaver mplayer" 2.69 + CAT="multimedia|with GTK3" 2.70 + ;; 2.71 + esac 2.72 TAGS="player audio video movie mp3 ogg dvd" 2.73 }
3.1 Binary file marlin/.icon.png has changed
4.1 --- a/marlin/receipt Thu Jun 14 13:45:57 2018 +0300 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,70 +0,0 @@ 4.4 -# SliTaz package receipt v2. 4.5 - 4.6 -PACKAGE="marlin" 4.7 -VERSION="0.5" 4.8 -CATEGORY="utilities" 4.9 -SHORT_DESC="A sleek and fast GTK3 file manager" 4.10 -MAINTAINER="al.bobylev@gmail.com" 4.11 -LICENSE="GPL2 GPL3" 4.12 -WEB_SITE="https://launchpad.net/marlin" 4.13 - 4.14 -BRANCH="879" 4.15 -TARBALL="$PACKAGE-$BRANCH.tar.bz2" 4.16 -WGET_URL="bzr|lp:marlin" 4.17 - 4.18 -BUILD_DEPENDS="bazaar cmake vala varka-dev gtk+3-dev libgee-dev sqlite3-dev \ 4.19 -dbus-glib-dev libnotify-dev dconf-dev tumbler-dev ffmpegthumbnailer-dev \ 4.20 -granite-dev gettext" 4.21 -SPLIT="marlin-dev" 4.22 - 4.23 -compile_rules() { 4.24 - # gee-1.0 is old while gee-0.8 is latest ;) 4.25 - sed -i 's|gee-1.0|gee-0.8|g' $(grep -l gee-1.0 $(find . -type f)) 4.26 - 4.27 - sed -i 's/Gdk.EventKey event = Gdk.EventKey(/Gdk.Event event = new Gdk.Event(Gdk.EventType.KEY_PRESS/' libwidgets/tests/tests-pathbar.vala 4.28 - sed -i 's/event\./&key./' libwidgets/tests/tests-pathbar.vala 4.29 - sed -i 's/event)/event.key)/' libwidgets/tests/tests-pathbar.vala 4.30 - 4.31 - mkdir build && cd build && 4.32 - cmake .. -DCMAKE_INSTALL_PREFIX=/usr && 4.33 - make && 4.34 - make DESTDIR=$install install 4.35 -} 4.36 - 4.37 -genpkg_rules() { 4.38 - case $PACKAGE in 4.39 - marlin) 4.40 - mkdir -p \ 4.41 - $fs/usr/bin \ 4.42 - $fs/usr/lib \ 4.43 - $fs/usr/share/locale 4.44 - cp -a $install/usr/bin $fs/usr 4.45 - cp -a $install/usr/lib/marlin $fs/usr/lib 4.46 - cp -a $install/usr/lib/*.so* $fs/usr/lib 4.47 - cp -a $install/usr/share/applications $fs/usr/share 4.48 - cp -a $install/usr/share/dbus* $fs/usr/share 4.49 - cp -a $install/usr/share/glib* $fs/usr/share 4.50 - cp -a $install/usr/share/icons $fs/usr/share 4.51 - cp -a $install/usr/share/marlin $fs/usr/share 4.52 - cp -a $install/usr/share/pixmaps $fs/usr/share 4.53 - 4.54 - # localization 4.55 - . $WOK/slitaz-i18n/stuff/locale-pack.conf 4.56 - for lang in $LOCALE_PACK; do 4.57 - langf=$install/usr/share/locale/$lang 4.58 - [ -d $langf ] && cp -a $langf $fs/usr/share/locale 4.59 - done 4.60 - 4.61 - # icons 4.62 - mkdir -p $fs/usr/share/icons/hicolor/16x16 4.63 - cp -a $stuff/apps $fs/usr/share/icons/hicolor/16x16 4.64 - cp -a $stuff/marlin.png $fs/usr/share/pixmaps 4.65 - DEPENDS="dbus-glib gtk+3 libgee libnotify libsqlite3 varka \ 4.66 - dconf" 4.67 - SUGGESTED="tumbler ffmpegthumbnailer granite extended-actions" 4.68 - ;; 4.69 - *-dev) 4.70 - copy @dev 4.71 - ;; 4.72 - esac 4.73 -}
5.1 Binary file marlin/stuff/apps/view-list-column.png has changed
6.1 Binary file marlin/stuff/apps/view-list-compact.png has changed
7.1 Binary file marlin/stuff/apps/view-list-details.png has changed
8.1 Binary file marlin/stuff/apps/view-list-icons.png has changed
9.1 Binary file marlin/stuff/marlin.png has changed
10.1 --- a/marlin/stuff/patches/marlin-0.5.patch Thu Jun 14 13:45:57 2018 +0300 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,51 +0,0 @@ 10.4 -# discussion: https://aur.archlinux.org/packages/marlin-bzr/ 10.5 -# patch found here: http://pastie.org/5189903 10.6 ---- marlin-0.5/src/fm-directory-view.h 10.7 -+++ marlin-0.5/src/fm-directory-view.h 10.8 -@@ -42,6 +42,7 @@ 10.9 - typedef struct FMDirectoryView FMDirectoryView; 10.10 - typedef struct FMDirectoryViewClass FMDirectoryViewClass; 10.11 - 10.12 -+#define FM_DIRECTORY_TYPE_VIEW fm_directory_view_get_type() 10.13 - #define FM_TYPE_DIRECTORY_VIEW fm_directory_view_get_type() 10.14 - #define FM_DIRECTORY_VIEW(obj) \ 10.15 - (G_TYPE_CHECK_INSTANCE_CAST ((obj), FM_TYPE_DIRECTORY_VIEW, FMDirectoryView)) 10.16 - 10.17 ---- marlin-0.5/src/exo-icon-view.c 10.18 -+++ marlin-0.5/src/exo-icon-view.c 10.19 -@@ -4641,8 +4641,15 @@ 10.20 - item = list ? list->data : NULL; 10.21 - 10.22 - /* Give focus to the first cell initially */ 10.23 -- exo_icon_view_set_cell_data (icon_view, item); 10.24 -- gtk_cell_area_focus (icon_view->priv->cell_area, direction); 10.25 -+ if (item == NULL) 10.26 -+ { 10.27 -+ return; 10.28 -+ } 10.29 -+ else 10.30 -+ { 10.31 -+ exo_icon_view_set_cell_data (icon_view, item); 10.32 -+ gtk_cell_area_focus (icon_view->priv->cell_area, direction); 10.33 -+ } 10.34 - } 10.35 - else 10.36 - { 10.37 -@@ -4798,8 +4805,15 @@ 10.38 - item = list ? list->data : NULL; 10.39 - 10.40 - /* Give focus to the first cell initially */ 10.41 -- exo_icon_view_set_cell_data (icon_view, item); 10.42 -- gtk_cell_area_focus (icon_view->priv->cell_area, direction); 10.43 -+ if (item == NULL) 10.44 -+ { 10.45 -+ return; 10.46 -+ } 10.47 -+ else 10.48 -+ { 10.49 -+ exo_icon_view_set_cell_data (icon_view, item); 10.50 -+ gtk_cell_area_focus (icon_view->priv->cell_area, direction); 10.51 -+ } 10.52 - } 10.53 - else 10.54 - {
11.1 --- a/marlin/stuff/patches/marlin-icons.patch Thu Jun 14 13:45:57 2018 +0300 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,129 +0,0 @@ 11.4 ---- marlin-0.5/src/View/Chrome/ViewSwicher.vala 11.5 -+++ marlin-0.5/src/View/Chrome/ViewSwicher.vala 11.6 -@@ -74,16 +74,16 @@ 11.7 - 11.8 - switcher = new ModeButton (); 11.9 - 11.10 -- icon = new Image.from_icon_name ("view-list-icons-symbolic", IconSize.MENU); 11.11 -+ icon = new Image.from_icon_name ("view-list-icons", IconSize.MENU); 11.12 - icon.set_tooltip_text (_("View as icons")); 11.13 - switcher.append(icon); 11.14 -- list = new Image.from_icon_name ("view-list-details-symbolic", IconSize.MENU); 11.15 -+ list = new Image.from_icon_name ("view-list-details", IconSize.MENU); 11.16 - list.set_tooltip_text (_("View as list")); 11.17 - switcher.append(list); 11.18 -- compact = new Image.from_icon_name ("view-list-compact-symbolic", IconSize.MENU); 11.19 -+ compact = new Image.from_icon_name ("view-list-compact", IconSize.MENU); 11.20 - compact.set_tooltip_text (_("View as compact list")); 11.21 - switcher.append(compact); 11.22 -- miller = new Image.from_icon_name ("view-list-column-symbolic", IconSize.MENU); 11.23 -+ miller = new Image.from_icon_name ("view-list-column", IconSize.MENU); 11.24 - miller.set_tooltip_text(_("View as column")); 11.25 - switcher.append(miller); 11.26 - 11.27 ---- marlin-0.5/src/View/Window.vala 11.28 -+++ marlin-0.5/src/View/Window.vala 11.29 -@@ -703,13 +703,13 @@ 11.30 - { "Redo", Stock.REDO, N_("_Redo"), 11.31 - "<control>Y", N_("Redo the last action"), 11.32 - action_redo_callback }, 11.33 -- { "Up", "go-up-symbolic", N_("Open _Parent"), 11.34 -+ { "Up", "go-up", N_("Open _Parent"), 11.35 - "<alt>Up", N_("Open the parent folder"), 11.36 - action_go_up }, 11.37 -- { "Back", "go-previous-symbolic", N_("_Back"), 11.38 -+ { "Back", "go-previous", N_("_Back"), 11.39 - "<alt>Left", N_("Go to the previous visited location"), 11.40 - action_go_back }, 11.41 -- { "Forward", "go-next-symbolic", N_("_Forward"), 11.42 -+ { "Forward", "go-next", N_("_Forward"), 11.43 - "<alt>Right", N_("Go to the next visited location"), 11.44 - action_go_forward }, 11.45 - { "Reload", Stock.REFRESH, N_("_Reload"), 11.46 ---- marlin-0.5/src/View/LocationBar.vala 11.47 -+++ marlin-0.5/src/View/LocationBar.vala 11.48 -@@ -110,7 +110,7 @@ 11.49 - dir = Environment.get_user_special_dir(UserDirectory.MUSIC); 11.50 - if(dir.contains("/")) 11.51 - { 11.52 -- IconDirectory icon = {dir, "folder-music-symbolic", false, null, null, dir.split("/"), false, null}; 11.53 -+ IconDirectory icon = {dir, "folder-music", false, null, null, dir.split("/"), false, null}; 11.54 - icon.exploded[0] = "/"; 11.55 - add_icon(icon); 11.56 - } 11.57 -@@ -119,7 +119,7 @@ 11.58 - dir = Environment.get_user_special_dir(UserDirectory.PICTURES); 11.59 - if(dir.contains("/")) 11.60 - { 11.61 -- IconDirectory icon = {dir, "folder-pictures-symbolic", false, null, null, dir.split("/"), false, null}; 11.62 -+ IconDirectory icon = {dir, "folder-pictures", false, null, null, dir.split("/"), false, null}; 11.63 - icon.exploded[0] = "/"; 11.64 - add_icon(icon); 11.65 - } 11.66 -@@ -128,7 +128,7 @@ 11.67 - dir = Environment.get_user_special_dir(UserDirectory.VIDEOS); 11.68 - if(dir.contains("/")) 11.69 - { 11.70 -- IconDirectory icon = {dir, "folder-videos-symbolic", false, null, null, dir.split("/"), false, null}; 11.71 -+ IconDirectory icon = {dir, "folder-videos", false, null, null, dir.split("/"), false, null}; 11.72 - icon.exploded[0] = "/"; 11.73 - add_icon(icon); 11.74 - } 11.75 -@@ -137,7 +137,7 @@ 11.76 - dir = Environment.get_user_special_dir(UserDirectory.DOWNLOAD); 11.77 - if(dir.contains("/")) 11.78 - { 11.79 -- IconDirectory icon = {dir, "folder-downloads-symbolic", false, null, null, dir.split("/"), false, null}; 11.80 -+ IconDirectory icon = {dir, "folder-downloads", false, null, null, dir.split("/"), false, null}; 11.81 - icon.exploded[0] = "/"; 11.82 - add_icon(icon); 11.83 - } 11.84 -@@ -146,7 +146,7 @@ 11.85 - dir = Environment.get_user_special_dir(UserDirectory.DOCUMENTS); 11.86 - if(dir.contains("/")) 11.87 - { 11.88 -- IconDirectory icon = {dir, "folder-documents-symbolic", false, null, null, dir.split("/"), false, null}; 11.89 -+ IconDirectory icon = {dir, "folder-documents", false, null, null, dir.split("/"), false, null}; 11.90 - icon.exploded[0] = "/"; 11.91 - add_icon(icon); 11.92 - } 11.93 -@@ -155,7 +155,7 @@ 11.94 - dir = Environment.get_user_special_dir(UserDirectory.TEMPLATES); 11.95 - if(dir.contains("/")) 11.96 - { 11.97 -- IconDirectory icon = {dir, "folder-templates-symbolic", false, null, null, dir.split("/"), false, null}; 11.98 -+ IconDirectory icon = {dir, "folder-templates", false, null, null, dir.split("/"), false, null}; 11.99 - icon.exploded[0] = "/"; 11.100 - add_icon(icon); 11.101 - } 11.102 -@@ -163,7 +163,7 @@ 11.103 - dir = Environment.get_home_dir(); 11.104 - if(dir.contains("/")) 11.105 - { 11.106 -- IconDirectory icon = {dir, "go-home-symbolic", false, null, null, dir.split("/"), true, null}; 11.107 -+ IconDirectory icon = {dir, "go-home", false, null, null, dir.split("/"), true, null}; 11.108 - icon.exploded[0] = "/"; 11.109 - add_icon(icon); 11.110 - } 11.111 ---- marlin-0.5/src/View/Chrome/TopMenu.vala 11.112 -+++ marlin-0.5/src/View/Chrome/TopMenu.vala 11.113 -@@ -43,7 +43,7 @@ 11.114 - compact_menu = (Gtk.Menu) win.ui.get_widget("/CompactMenu"); 11.115 - toolbar_menu = (Gtk.Menu) win.ui.get_widget("/ToolbarMenu"); 11.116 - 11.117 -- app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system-symbolic", IconSize.MENU), 11.118 -+ app_menu = new Varka.Widgets.ToolButtonWithMenu (new Image.from_icon_name ("emblem-system", IconSize.MENU), 11.119 - null, _("Menu"), compact_menu); 11.120 - setup_items(); 11.121 - show(); 11.122 ---- marlin-0.5/libwidgets/BreadcrumbsEntry.vala 11.123 -+++ marlin-0.5/libwidgets/BreadcrumbsEntry.vala 11.124 -@@ -74,7 +74,7 @@ 11.125 - 11.126 - /* Load arrow image */ 11.127 - try { 11.128 -- arrow_img = IconTheme.get_default ().load_icon ("go-jump-symbolic", 16, IconLookupFlags.GENERIC_FALLBACK); 11.129 -+ arrow_img = IconTheme.get_default ().load_icon ("go-jump", 16, IconLookupFlags.GENERIC_FALLBACK); 11.130 - } catch(Error err) { 11.131 - stderr.printf ("Unable to load home icon: %s", err.message); 11.132 - }