Merge pull request #16350 from 4fury-c3440d8/mmm

Clean up obsolete.
This commit is contained in:
Kamil ATLI
2025-04-05 11:58:52 +03:00
committed by GitHub
12 changed files with 222 additions and 4148 deletions
+1 -3
View File
@@ -7,6 +7,7 @@
from pisi.actionsapi import shelltools, autotools, pisitools, get
i = ''.join([
' --disable-static',
' --disable-oss',
' --disable-coreaudio '
])
@@ -14,7 +15,6 @@ i = ''.join([
def setup():
shelltools.export("CC", "/usr/bin/clang")
shelltools.export("CXX", "/usr/bin/clang++")
#shelltools.export("LDFLAGS", "%s -fuse-ld=lld -ldl " % get.LDFLAGS())
autotools.configure(i)
def build():
@@ -22,5 +22,3 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("about.txt", "AUTHORS", "ChangeLog")
@@ -0,0 +1,54 @@
From 5c5d44afb13a0d0008e859305848dda7686b2a0f Mon Sep 17 00:00:00 2001
From: Oleksiy Yakovenko <wakeroid@gmail.com>
Date: Tue, 1 Apr 2025 18:26:17 +0200
Subject: [PATCH] gtkui: fix auto-naming playlists regression (fixes #3168)
---
plugins/gtkui/fileman.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/plugins/gtkui/fileman.c b/plugins/gtkui/fileman.c
index 803b434e80..c8119e61b2 100644
--- a/plugins/gtkui/fileman.c
+++ b/plugins/gtkui/fileman.c
@@ -48,7 +48,7 @@ gtkpl_add_dirs (ddb_playlist_t *plt, GSList *lst) {
char t[1000];
if (!deadbeef->plt_get_title (plt, t, sizeof (t))) {
char *def = _("New Playlist");
- if (!strncmp (t, def, strlen (def)) || empty) {
+ if (empty || !strncmp (t, def, strlen (def))) {
const char *folder = strrchr ((char*)lst->data, G_DIR_SEPARATOR);
if (!folder) {
folder = lst->data;
@@ -76,7 +76,14 @@ gtkpl_add_files (ddb_playlist_t *plt, GSList *lst) {
void
gtkui_add_dirs (GSList *lst) {
ddb_playlist_t *plt_curr = deadbeef->plt_get_curr ();
- ddb_playlist_t *plt = deadbeef->plt_alloc ("add-dirs");
+
+ char *title = malloc(1000);
+ deadbeef->plt_get_title (plt_curr, title, 1000);
+
+ ddb_playlist_t *plt = deadbeef->plt_alloc (title);
+
+ free (title);
+ title = NULL;
if (deadbeef->plt_add_files_begin (plt_curr, 0) < 0) {
deadbeef->plt_unref (plt);
@@ -92,6 +99,15 @@ gtkui_add_dirs (GSList *lst) {
gtkui_dispatch_on_main(^{
ddb_playItem_t *tail = deadbeef->plt_get_tail_item(plt_curr, PL_MAIN);
+
+ char *new_title = malloc(1000);
+
+ deadbeef->plt_get_title(plt, new_title, 1000);
+ deadbeef->plt_set_title(plt_curr, new_title);
+
+ free (new_title);
+ new_title = NULL;
+
ddb_undo->set_action_name (_("Add Folders"));
deadbeef->plt_move_all_items (plt_curr, plt, tail);
if (tail != NULL) {
File diff suppressed because it is too large Load Diff
+14 -8
View File
@@ -15,11 +15,9 @@
<IsA>app:gui</IsA>
<PartOf>multimedia.sound</PartOf>
<Summary>Audio player for GNU/Linux systems with X11.</Summary>
<Description>
DeaDBeeF (as in 0xDEADBEEF) is a modular audio player for GNU/Linux, *BSD, OpenSolaris, macOS, and other UNIX-like systems.
</Description>
<Archive sha1sum="ae6f3d7856690d7c2079c5fec27a5c896ba1f5d7" type="tarbz2">
mirrors://sourceforge/deadbeef/deadbeef-1.9.6.tar.bz2
<Description>DeaDBeeF (as in 0xDEADBEEF) is a modular audio player for GNU/Linux, *BSD, OpenSolaris, macOS, and other UNIX-like systems.</Description>
<Archive sha1sum="686107a1bf3b9a95fb17277b914227a11f854544" type="tarbz2">
mirrors://sourceforge/deadbeef/deadbeef-1.10.0.tar.bz2
</Archive>
<BuildDependencies>
<Dependency>bison</Dependency>
@@ -42,7 +40,7 @@
<Dependency>ffmpeg-devel</Dependency>
<Dependency>libmad-devel</Dependency>
<Dependency>libzip-devel</Dependency>
<!-- <Dependency>imlib2-devel</Dependency> -->
<Dependency>imlib2-devel</Dependency>
<Dependency>mpg123-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>jansson-devel</Dependency>
@@ -64,7 +62,8 @@
<Dependency>pulseaudio-libs-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">return_ru_trnsl.patch</Patch>
<!-- <Patch level="1"></Patch> -->
<Patch level="1">auto-naming_playlists_regression.patch</Patch>
</Patches>
</Source>
@@ -89,7 +88,7 @@
<Dependency>ffmpeg</Dependency>
<Dependency>libmad</Dependency>
<Dependency>libzip</Dependency>
<!-- <Dependency>imlib2</Dependency> -->
<Dependency>imlib2</Dependency>
<Dependency>wavpack</Dependency>
<Dependency>libcdio</Dependency>
<Dependency>libcddb</Dependency>
@@ -118,6 +117,13 @@
</Package>
<History>
<Update release="23">
<Date>2025-04-05</Date>
<Version>1.10.0</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="22">
<Date>2024-08-25</Date>
<Version>1.9.6</Version>
+4 -4
View File
@@ -14,12 +14,12 @@ j = ''.join([
])
def setup():
cmaketools.configure(j)
cmaketools.configure(j)
def build():
mesontools.build()
mesontools.build()
def install():
mesontools.install()
mesontools.install()
pisitools.dodoc("COPYING")
pisitools.dodoc("COPYING")
+100 -93
View File
@@ -1,99 +1,106 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>yarock</Name>
<Homepage>https://github.com/sebaro/Yarock</Homepage>
<Packager>
<Name>Pisilinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<Summary>Yarock is a modern looking music player.</Summary>
<Description>A modern looking music player, packed with features, that doesnt depend on any specific desktop environment.</Description>
<Archive sha1sum="ca2a5dcbf0226c1b6b5449b9f75984a0e82ed0ed" type="targz">https://github.com/sebaro/Yarock/archive/1.5.0/Yarock-1.5.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>taglib-devel</Dependency>
<Dependency>qt6-sql-odbc</Dependency>
<Dependency>qt6-linguist</Dependency>
<Dependency>htmlcxx-devel</Dependency>
<Dependency>qt6-sql-mysql</Dependency>
<Dependency>qt6-base-devel</Dependency>
<Dependency>qt6-sql-sqlite</Dependency>
<Dependency>qt6-phonon-devel</Dependency>
<Dependency>qt6-sql-postgresql</Dependency>
<Dependency>qt6-multimedia-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Source>
<Name>yarock</Name>
<Homepage>https://github.com/sebaro/Yarock</Homepage>
<Packager>
<Name>Pisilinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<Summary>Yarock is a modern looking music player.</Summary>
<Description>A modern looking music player, packed with features, that doesnt depend on any specific desktop environment.</Description>
<Archive sha1sum="2976f951618eee98468bb8560836fde8b70cea53" type="targz">https://github.com/sebaro/Yarock/archive/1.5.1/Yarock-1.5.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>taglib-devel</Dependency>
<Dependency>qt6-sql-odbc</Dependency>
<Dependency>qt6-linguist</Dependency>
<Dependency>htmlcxx-devel</Dependency>
<Dependency>qt6-sql-mysql</Dependency>
<Dependency>qt6-base-devel</Dependency>
<Dependency>qt6-sql-sqlite</Dependency>
<Dependency>qt6-phonon-devel</Dependency>
<Dependency>qt6-sql-postgresql</Dependency>
<Dependency>qt6-multimedia-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Package>
<Name>yarock</Name>
<RuntimeDependencies>
<Dependency>taglib</Dependency>
<Dependency>htmlcxx</Dependency>
<Dependency>qt6-base</Dependency>
<Dependency>qt6-phonon</Dependency>
<Dependency>qt6-sql-odbc</Dependency>
<Dependency>qt6-sql-mysql</Dependency>
<Dependency>qt6-sql-sqlite</Dependency>
<Dependency>qt6-multimedia</Dependency>
<Dependency>qt6-sql-postgresql</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>yarock</Name>
<RuntimeDependencies>
<Dependency>taglib</Dependency>
<Dependency>htmlcxx</Dependency>
<Dependency>qt6-base</Dependency>
<Dependency>qt6-phonon</Dependency>
<Dependency>qt6-sql-odbc</Dependency>
<Dependency>qt6-sql-mysql</Dependency>
<Dependency>qt6-sql-sqlite</Dependency>
<Dependency>qt6-multimedia</Dependency>
<Dependency>qt6-sql-postgresql</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="6">
<Date>2024-12-28</Date>
<Version>1.5.0</Version>
<Comment>New upstream.</Comment>
<Name>Pisilinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2020-09-17</Date>
<Version>1.4.0</Version>
<Comment>Rebuild New T.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2019-04-15</Date>
<Version>1.4.0</Version>
<Comment>Version bump</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="3">
<Date>2018-09-01</Date>
<Version>1.1.6</Version>
<Comment>Rebuild New T.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-04-23</Date>
<Version>1.1.6</Version>
<Comment>Rebuild with new toolchain</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-11-24</Date>
<Version>1.1.6</Version>
<Comment>First Release</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
<History>
<Update release="7">
<Date>2025-04-05</Date>
<Version>1.5.1</Version>
<Comment>New upstream.</Comment>
<Name>Pisilinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2024-12-28</Date>
<Version>1.5.0</Version>
<Comment>New upstream.</Comment>
<Name>Pisilinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2020-09-17</Date>
<Version>1.4.0</Version>
<Comment>Rebuild New T.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2019-04-15</Date>
<Version>1.4.0</Version>
<Comment>Version bump</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="3">
<Date>2018-09-01</Date>
<Version>1.1.6</Version>
<Comment>Rebuild New T.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2017-04-23</Date>
<Version>1.1.6</Version>
<Comment>Rebuild with new toolchain</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-11-24</Date>
<Version>1.1.6</Version>
<Comment>First Release</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</History>
</PISI>
+14 -18
View File
@@ -6,30 +6,26 @@
from pisi.actionsapi import shelltools
from pisi.actionsapi import cmaketools
from pisi.actionsapi import mesontools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
j = "-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_THREAD_LIBS_INIT='-lpthread' \
-DCMAKE_HAVE_THREADS_LIBRARY=ON \
-DCMAKE_USE_PTHREADS_INIT=ON \
-DBUILD_TESTING=OFF \
-B_build -LA \
"
j = ''.join([
' -DCMAKE_INSTALL_PREFIX=/usr',
' -DCMAKE_BUILD_TYPE=Release',
' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON',
' -DBUILD_TESTING=OFF',
' -Bbuild -G Ninja -L '
])
def setup():
shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++")
cmaketools.configure(j)
shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++")
cmaketools.configure(j)
def build():
shelltools.cd("_build")
cmaketools.make()
mesontools.build()
def install():
shelltools.cd("_build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("../CONTRIBUTING.md", "../INSTALL.md", "../README.md", "../TESTING.md")
mesontools.install()
pisitools.dodoc("LICENSE")
@@ -1,11 +0,0 @@
--- tests/dispatch_test.c.orig
+++ tests/dispatch_test.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <unistd.h>
-#if __has_include(<sys/event.h>)
+#if __has_include(<sys/event.h>) && !defined(__linux__)
#define HAS_SYS_EVENT_H 1
#include <sys/event.h>
#else
@@ -1,10 +0,0 @@
--- cmake/modules/DispatchCompilerWarnings.cmake.orig 2020-05-12 13:13:59.619689872 +0300
+++ cmake/modules/DispatchCompilerWarnings.cmake 2020-05-12 13:13:35.216171428 +0300
@@ -2,7 +2,6 @@
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
# TODO: someone needs to provide the msvc equivalent warning flags
else()
- add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
+13 -7
View File
@@ -3,7 +3,7 @@
<PISI>
<Source>
<Name>libdispatch</Name>
<Homepage>https://apple.github.io/swift-corelibs-libdispatch/</Homepage>
<Homepage>https://swiftlang.github.io/swift-corelibs-libdispatch/</Homepage>
<Packager>
<Name>Pisilinux Community</Name>
<Email>admin@pisilinux.org</Email>
@@ -12,17 +12,17 @@
<IsA>library</IsA>
<Summary>Grand Central Dispatch.</Summary>
<Description>Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware.</Description>
<Archive sha1sum="d4be580d2aa6f7d2d066216a41035c853f73dd2b" type="targz">
https://github.com/apple/swift-corelibs-libdispatch/archive/refs/tags/swift-5.5-RELEASE.tar.gz
<Archive sha1sum="fd6cda567e682bc46cafe91d07fc34c545f610f6" type="targz">
https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/swift-6.1-RELEASE.tar.gz
</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>llvm-clang</Dependency>
<Dependency>llvm-clang-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="0">avoid-libkqueue.patch</Patch>
<Patch level="0">remove-werror.patch</Patch>
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
@@ -33,8 +33,7 @@
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share</Path>
</Files>
</Package>
@@ -49,6 +48,13 @@
</Package>
<History>
<Update release="5">
<Date>2025-04-05</Date>
<Version>6.1</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="4">
<Date>2022-11-25</Date>
<Version>5.5</Version>
+13 -6
View File
@@ -4,16 +4,23 @@
# 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 shelltools, autotools, pisitools, get
from pisi.actionsapi import mesontools, pisitools
i = ''.join([
' --prefix=/usr',
' -Denable-apport=false',
' -Denable-dbusmenu=yes',
' -Dproduction_release=true',
' -Denable-docs=false '
])
def setup():
shelltools.system("NOCONFIGURE=1 ./autogen.sh")
autotools.configure("--prefix=/usr --disable-{apport,docs,static}")
mesontools.configure(i)
def build():
autotools.make()
mesontools.build()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
mesontools.install()
pisitools.dodoc("AUTHORS", "COPYING", "COPYING.LGPL2.1", "COPYRIGHT")
pisitools.dodoc("AUTHORS", "COPYING", "COPYRIGHT")
+9 -1
View File
@@ -13,8 +13,9 @@
<IsA>app</IsA>
<Summary>Plank reloaded. Still stupidly simple.</Summary>
<Description>A simplest dock. Also it is library which can be extended to create other dock programs with more advanced features.</Description>
<Archive sha1sum="e0120779245eef410e2f361a8b27ca39bb7842ca" type="targz">https://github.com/zquestz/plank-reloaded/archive/0.11.100/plank-reloaded-0.11.100.tar.gz</Archive>
<Archive sha1sum="bc2e678f481544bc538dcf0e06c923665d3509ca" type="targz">https://github.com/zquestz/plank-reloaded/archive/0.11.118/plank-reloaded-0.11.118.tar.gz</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>atk-devel</Dependency>
<Dependency>bamf-devel</Dependency>
<Dependency>vala-devel</Dependency>
@@ -34,6 +35,7 @@
<Dependency>gdk-pixbuf-devel</Dependency>
<Dependency>gnome-menus-devel</Dependency>
<Dependency>libdbusmenu-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
</BuildDependencies>
<Patches>
@@ -89,6 +91,12 @@
</Package>
<History>
<Update release="5">
<Date>2025-04-05</Date>
<Version>0.11.118</Version>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="4">
<Date>2025-02-06</Date>
<Version>0.11.100</Version>