easytag rebuild from bleeding edge upstream.

This commit is contained in:
4fury-c3440d8
2026-05-11 13:55:56 +04:00
parent 4d01ed26e0
commit d116bd1f49
8 changed files with 286 additions and 24662 deletions
+12 -25
View File
@@ -4,35 +4,22 @@
# Licensed under the GNU General Public License, version 3.
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools, autotools, pisitools, get
i = ''.join([
' --prefix=/usr',
' --disable-tests',
' --disable-{schemas-compile,nautilus-actions} '
])
def setup():
autotools.configure("\
\
--enable-man \
--enable-mp3 \
--enable-ogg \
--enable-mp4 \
--enable-opus \
--enable-flac \
--enable-speex \
--enable-id3v23 \
--enable-wavpack \
\
--disable-schemas-compile \
--disable-nautilus-actions")
shelltools.system("NOCONFIGURE=1 sh autogen.sh")
autotools.configure(i)
def build():
autotools.make()
def check():
pass
# autotools.make("check")
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README", "THANKS", "TODO")
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "COPYING", "COPYING.GPL3", "THANKS")
@@ -0,0 +1,97 @@
From 7f82fce51326e030582cba1511658327aa764313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
Date: Sun, 29 Dec 2024 17:15:19 +0100
Subject: [PATCH] Remove appmenu
---
data/menus.ui | 39 +++++++++++++++++++++------------------
src/application.c | 4 ----
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/data/menus.ui b/data/menus.ui
index 5a7c7f5..c5c7331 100644
--- a/data/menus.ui
+++ b/data/menus.ui
@@ -1,22 +1,4 @@
<interface domain='easytag'>
- <menu id='app-menu'>
- <section>
- <item>
- <attribute name="accel">F1</attribute>
- <attribute name="label" translatable="yes">_Help</attribute>
- <attribute name="action">app.help</attribute>
- </item>
- <item>
- <attribute name="label" translatable="yes">_About</attribute>
- <attribute name="action">app.about</attribute>
- </item>
- <item>
- <attribute name="accel">&lt;Primary&gt;q</attribute>
- <attribute name="label" translatable="yes">_Quit</attribute>
- <attribute name="action">app.quit</attribute>
- </item>
- </section>
- </menu>
<menu id='menubar'>
<submenu>
<attribute name="label" translatable="yes">_File</attribute>
@@ -66,6 +48,13 @@
<attribute name="label" translatable="yes">_Force Save Files</attribute>
</item>
</section>
+ <section>
+ <item>
+ <attribute name="accel">&lt;Primary&gt;q</attribute>
+ <attribute name="label" translatable="yes">_Quit</attribute>
+ <attribute name="action">app.quit</attribute>
+ </item>
+ </section>
</submenu>
<submenu>
<attribute name="label" translatable="yes">_Edit</attribute>
@@ -523,6 +512,20 @@
</item>
</section>
</submenu>
+ <submenu id='app-menu'>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ <item>
+ <attribute name="accel">F1</attribute>
+ <attribute name="label" translatable="yes">_Contents</attribute>
+ <attribute name="action">app.help</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_About</attribute>
+ <attribute name="action">app.about</attribute>
+ </item>
+ </section>
+ </submenu>
</menu>
<menu id='directory-menu'>
<section>
diff --git a/src/application.c b/src/application.c
index 440db7e..674810d 100644
--- a/src/application.c
+++ b/src/application.c
@@ -515,7 +515,6 @@ static void
et_application_startup (GApplication *application)
{
GtkBuilder *builder;
- GMenuModel *appmenu;
GMenuModel *menubar;
g_action_map_add_action_entries (G_ACTION_MAP (application), actions,
@@ -527,9 +526,6 @@ et_application_startup (GApplication *application)
g_set_application_name (_(PACKAGE_NAME));
builder = gtk_builder_new_from_resource ("/org/gnome/EasyTAG/menus.ui");
- appmenu = G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"));
- gtk_application_set_app_menu (GTK_APPLICATION (application), appmenu);
-
menubar = G_MENU_MODEL (gtk_builder_get_object (builder, "menubar"));
gtk_application_set_menubar (GTK_APPLICATION (application), menubar);
--
GitLab
@@ -0,0 +1,87 @@
From 8cbf56c6a32a8aaa5fad0e1444918f33c138a3ac Mon Sep 17 00:00:00 2001
From: Anton Karmanov <bergertroll@insiberia.net>
Date: Fri, 3 Apr 2020 17:31:04 +0500
Subject: [PATCH] Set black foreground for colored lines in browser
---
src/browser.c | 13 ++++++++-----
src/et_core.c | 2 ++
src/et_core.h | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/browser.c b/src/browser.c
index 6a6daf1..ddaa96f 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1722,8 +1722,7 @@ Browser_List_Set_Row_Appearance (EtBrowser *self, GtkTreeIter *iter)
EtBrowserPrivate *priv;
ET_File *rowETFile = NULL;
gboolean otherdir = FALSE;
- const GdkRGBA LIGHT_BLUE = { 0.866, 0.933, 1.0, 1.0 };
- const GdkRGBA *background;
+ const GdkRGBA *background, *foreground;
//gchar *temp = NULL;
priv = et_browser_get_instance_private (self);
@@ -1740,9 +1739,13 @@ Browser_List_Set_Row_Appearance (EtBrowser *self, GtkTreeIter *iter)
// Must change background color?
if (otherdir)
+ {
background = &LIGHT_BLUE;
- else
+ foreground = &BLACK;
+ } else {
background = NULL;
+ foreground = NULL;
+ }
// Set text to bold/red if 'filename' or 'tag' changed
if (!et_file_check_saved (rowETFile))
@@ -1752,7 +1755,7 @@ Browser_List_Set_Row_Appearance (EtBrowser *self, GtkTreeIter *iter)
gtk_list_store_set(priv->file_model, iter,
LIST_FONT_WEIGHT, PANGO_WEIGHT_BOLD,
LIST_ROW_BACKGROUND, background,
- LIST_ROW_FOREGROUND, NULL, -1);
+ LIST_ROW_FOREGROUND, foreground, -1);
} else
{
gtk_list_store_set(priv->file_model, iter,
@@ -1765,7 +1768,7 @@ Browser_List_Set_Row_Appearance (EtBrowser *self, GtkTreeIter *iter)
gtk_list_store_set(priv->file_model, iter,
LIST_FONT_WEIGHT, PANGO_WEIGHT_NORMAL,
LIST_ROW_BACKGROUND, background,
- LIST_ROW_FOREGROUND, NULL ,-1);
+ LIST_ROW_FOREGROUND, foreground,-1);
}
// Update text fields
diff --git a/src/et_core.c b/src/et_core.c
index ef363b8..ee1d398 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -27,6 +27,8 @@ ET_Core *ETCore = NULL;
/*
* Colors Used
*/
+GdkRGBA BLACK = {0.0, 0.0, 0.0, 1.0 };
+GdkRGBA LIGHT_BLUE = { 0.866, 0.933, 1.0, 1.0 };
GdkRGBA RED = {1.0, 0.0, 0.0, 1.0 };
void
diff --git a/src/et_core.h b/src/et_core.h
index 9775d5a..2a1060a 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
/*
* Colors Used (see declaration into et_core.c)
*/
-extern GdkRGBA RED;
+extern GdkRGBA BLACK, LIGHT_BLUE, RED;
/*
* Description of all variables, lists needed by EasyTAG
--
GitLab
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+85 -82
View File
@@ -1,88 +1,91 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>easytag</Name>
<Homepage>https://wiki.gnome.org/Apps/EasyTAG</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>easytag</Icon>
<IsA>app:gui</IsA>
<PartOf>multimedia.editor</PartOf>
<Summary>Audio File Tag Viewer/Editor</Summary>
<Description>
EasyTAG is a utility for viewing and editing id tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files.
</Description>
<Archive sha1sum="eb8196fe699543776e632de4c3931f88fb82aaa4" type="tarxz">
https://download.gnome.org/sources/easytag/2.4/easytag-2.4.3.tar.xz
</Archive>
<BuildDependencies>
<Dependency>itstool</Dependency>
<Dependency>intltool</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>flac-devel</Dependency>
<Dependency>speex-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>docbook-xml</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>taglib-devel</Dependency>
<Dependency>libogg-devel</Dependency>
<Dependency>id3lib-devel</Dependency>
<Dependency>wavpack-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>libopus-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>opusfile-devel</Dependency>
<Dependency>libid3tag-devel</Dependency>
<Dependency>libvorbis-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>appstream-glib-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">ru_translation.patch</Patch>
<Patch level="1">basque_translation.patch</Patch>
<Patch level="1">slovenian_translation.patch</Patch>
</Patches>
</Source>
<Source>
<Name>easytag</Name>
<Homepage>https://wiki.gnome.org/Apps/EasyTAG</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>easytag</Icon>
<IsA>app:gui</IsA>
<PartOf>multimedia.editor</PartOf>
<Summary>Audio File Tag Viewer/Editor.</Summary>
<Description>EasyTAG is a utility for viewing and editing id tags for MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files.</Description>
<Archive sha1sum="b66e6059d205932556adb77a105470af9c00c337" type="tarbz2">https://gitlab.gnome.org/GNOME/easytag/-/archive/ae74ec026641f5232bf2c65b6dacfba70cd7542c/easytag-ae74ec026641f5232bf2c65b6dacfba70cd7542c.tar.bz2</Archive>
<BuildDependencies>
<Dependency>itstool</Dependency>
<Dependency>intltool</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>flac-devel</Dependency>
<Dependency>speex-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>docbook-xml</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>taglib-devel</Dependency>
<Dependency>libogg-devel</Dependency>
<Dependency>id3lib-devel</Dependency>
<Dependency>wavpack-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>libopus-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>opusfile-devel</Dependency>
<Dependency>libid3tag-devel</Dependency>
<Dependency>libvorbis-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>appstream-glib-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1"></Patch> -->
<Patch level="1">Remove_appmenu.patch</Patch>
<Patch level="1">Set_black_foreground_for_colored_lines_in_browser.patch</Patch>
</Patches>
</Source>
<Package>
<Name>easytag</Name>
<RuntimeDependencies>
<Dependency>flac</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>glib2</Dependency>
<Dependency>speex</Dependency>
<Dependency>id3lib</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libogg</Dependency>
<Dependency>taglib</Dependency>
<Dependency>libopus</Dependency>
<Dependency>wavpack</Dependency>
<Dependency>opusfile</Dependency>
<Dependency>libid3tag</Dependency>
<Dependency>libvorbis</Dependency>
<Dependency>gdk-pixbuf</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>easytag</Name>
<RuntimeDependencies>
<Dependency>flac</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>glib2</Dependency>
<Dependency>speex</Dependency>
<Dependency>id3lib</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libogg</Dependency>
<Dependency>taglib</Dependency>
<Dependency>libopus</Dependency>
<Dependency>wavpack</Dependency>
<Dependency>opusfile</Dependency>
<Dependency>libid3tag</Dependency>
<Dependency>libvorbis</Dependency>
<Dependency>gdk-pixbuf</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="1">
<Date>2020-12-04</Date>
<Version>2.4.3</Version>
<Comment>First release.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
<History>
<Update release="2">
<Date>2026-05-11</Date>
<Version>2.4.3</Version>
<Comment>Rebuild from git.</Comment>
<Name>Ali</Name>
<Email>alipisiturk@isis-government.com.tr</Email>
</Update>
<Update release="1">
<Date>2020-12-04</Date>
<Version>2.4.3</Version>
<Comment>First release.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
</History>
</PISI>
+5 -5
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>easytag</Name>
<Summary xml:lang="tr">Ses Dosyaları Etiketlerini Görüntüleme/Düzenleme Yazılımı</Summary>
<Description xml:lang="tr">EasyTAG MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, Musepack ve Monkey's Audio ses dosyalarının id etiketlerinin görüntülenebileceği ve düzenlenebileceği bir yazılımdır.</Description>
</Source>
<Source>
<Name>easytag</Name>
<Summary xml:lang="tr">Ses Dosyaları Etiketlerini Görüntüleme/Düzenleme Yazılımı</Summary>
<Description xml:lang="tr">EasyTAG MP3, MP2, MP4/AAC, FLAC, Ogg Vorbis, Musepack ve Monkey's Audio ses dosyalarının id etiketlerinin görüntülenebileceği ve düzenlenebileceği bir yazılımdır.</Description>
</Source>
</PISI>