Merge pull request #16922 from mrSi-Si/various

crow-translate etc.
This commit is contained in:
Kamil ATLI
2025-07-03 16:38:40 +03:00
committed by GitHub
9 changed files with 43 additions and 147 deletions
+3 -5
View File
@@ -1,13 +1,12 @@
#!/usr/bin/env python
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import shelltools
from pisi.actionsapi import mesontools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
shelltools.system("sed -i 's/install_dir: systemd_userunitdir,//' service/meson.build")
@@ -15,9 +14,8 @@ def setup():
def build():
mesontools.build()
def install():
mesontools.install()
pisitools.dodoc("COPYING", "NEWS", "README")
+4 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>dconf</Name>
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>Simple low-level configuration system</Summary>
<Description>dconf is a low-level configuration system. Its main purpose is to provide a backend to GSettings on platforms that don't already have configuration storage systems.</Description>
<Archive sha1sum="c8e12b98b2b10ccae4ee13395a39b3e913f58ab6" type="tarxz">http://ftp.acc.umu.se/pub/gnome/sources/dconf/0.40/dconf-0.40.0.tar.xz</Archive>
<Archive sha1sum="c8e12b98b2b10ccae4ee13395a39b3e913f58ab6" type="tarxz">https://download.gnome.org/sources/dconf/0.40/dconf-0.40.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>ninja</Dependency>
@@ -53,7 +53,7 @@
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/share/vala</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
@@ -91,7 +91,7 @@
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Update release="7">
<Date>2020-01-14</Date>
<Version>0.34.0</Version>
<Comment>Version bump</Comment>
+5 -6
View File
@@ -1,16 +1,14 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/copyleft/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
from pisi.actionsapi import pisitools
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
shelltools.system("./autogen.sh")
autotools.configure("--disable-static \
--libexecdir=/usr/lib \
--sysconfdir=/etc")
@@ -20,4 +18,5 @@ def build():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("AUTHORS", "COPYING")
@@ -1,108 +0,0 @@
From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Fri, 24 Jan 2020 13:33:00 +0900
Subject: [PATCH] Support gcc10 compilation
gcc10 now defaults to -fno-common, and with gcc10 menu-cache compilation fails like
/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:167: multiple definition of `DirDirs'; main.o:menu-cache-gen/menu-tags.h:167: first defined here
/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:164: multiple definition of `AppDirs'; main.o:menu-cache-gen/menu-tags.h:164: first defined here
/bin/ld: menu-merge.o:menu-cache-gen/menu-tags.h:52: multiple definition of `menuTag_Layout'; main.o:menu-cache-gen/menu-tags.h:52: first defined here
....
This patch fixes compilation with gcc10: properly declaring variables in header with "extern", and also removing some unneeded variables in header files.
---
menu-cache-gen/menu-tags.h | 55 ++++++++++++--------------------------
1 file changed, 17 insertions(+), 38 deletions(-)
diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
index f3fd7d3..f71c0bc 100644
--- a/menu-cache-gen/menu-tags.h
+++ b/menu-cache-gen/menu-tags.h
@@ -22,38 +22,17 @@
#include <libfm/fm-extra.h>
#include <menu-cache.h>
-FmXmlFileTag menuTag_Menu;
-FmXmlFileTag menuTag_AppDir;
-FmXmlFileTag menuTag_DefaultAppDirs;
-FmXmlFileTag menuTag_DirectoryDir;
-FmXmlFileTag menuTag_DefaultDirectoryDirs;
-FmXmlFileTag menuTag_Include;
-FmXmlFileTag menuTag_Exclude;
-FmXmlFileTag menuTag_Filename;
-FmXmlFileTag menuTag_Or;
-FmXmlFileTag menuTag_And;
-FmXmlFileTag menuTag_Not;
-FmXmlFileTag menuTag_Category;
-FmXmlFileTag menuTag_MergeFile;
-FmXmlFileTag menuTag_MergeDir;
-FmXmlFileTag menuTag_DefaultMergeDirs;
-FmXmlFileTag menuTag_Directory;
-FmXmlFileTag menuTag_Name;
-FmXmlFileTag menuTag_Deleted;
-FmXmlFileTag menuTag_NotDeleted;
-FmXmlFileTag menuTag_OnlyUnallocated;
-FmXmlFileTag menuTag_NotOnlyUnallocated;
-FmXmlFileTag menuTag_All;
-FmXmlFileTag menuTag_LegacyDir;
-FmXmlFileTag menuTag_KDELegacyDirs;
-FmXmlFileTag menuTag_Move;
-FmXmlFileTag menuTag_Old;
-FmXmlFileTag menuTag_New;
-FmXmlFileTag menuTag_Layout;
-FmXmlFileTag menuTag_DefaultLayout;
-FmXmlFileTag menuTag_Menuname;
-FmXmlFileTag menuTag_Separator;
-FmXmlFileTag menuTag_Merge;
+extern FmXmlFileTag menuTag_AppDir;
+extern FmXmlFileTag menuTag_DirectoryDir;
+extern FmXmlFileTag menuTag_Include;
+extern FmXmlFileTag menuTag_Exclude;
+extern FmXmlFileTag menuTag_Filename;
+extern FmXmlFileTag menuTag_Or;
+extern FmXmlFileTag menuTag_And;
+extern FmXmlFileTag menuTag_Not;
+extern FmXmlFileTag menuTag_Category;
+extern FmXmlFileTag menuTag_All;
+extern FmXmlFileTag menuTag_LegacyDir;
typedef enum {
MERGE_NONE, /* starting value */
@@ -152,19 +131,19 @@ typedef struct {
} MenuRule;
/* requested language(s) */
-char **languages;
+extern char **languages;
/* list of menu files to monitor */
-GSList *MenuFiles;
+extern GSList *MenuFiles;
/* list of menu dirs to monitor */
-GSList *MenuDirs;
+extern GSList *MenuDirs;
/* list of available app dirs */
-GSList *AppDirs;
+extern GSList *AppDirs;
/* list of available dir dirs */
-GSList *DirDirs;
+extern GSList *DirDirs;
/* parse and merge menu files */
MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error);
@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil
void _free_layout_items(GList *data);
/* verbosity level */
-gint verbose;
+extern gint verbose;
#define DBG if (verbose) g_debug
#define VDBG if (verbose > 1) g_debug
--
2.24.1
+9 -7
View File
@@ -1,19 +1,19 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>menu-cache</Name>
<Homepage>https://www.lxde.org/</Homepage>
<Homepage>https://github.com/lxde/menu-cache</Homepage>
<Packager>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Packager>
<License>GPL2</License>
<License>LGPLv2.1</License>
<IsA>app</IsA>
<Icon>lxqt</Icon>
<Summary>freedesktop.org desktop menus for LXDE</Summary>
<Description>Library used to read freedesktop.org menus</Description>
<Archive sha1sum="e3cd5ca9f094c7e1d8ca09b43bf5d819cd4efc26" type="targz">https://github.com/lxde/menu-cache/archive/1.1.1.tar.gz</Archive>
<Archive sha1sum="47f8952597e4a9bdb52de64f4e701e8f9f63d952" type="tarxz">https://github.com/lxde/releases/raw/master/releases/menu-cache-1.1.1.tar.xz</Archive>
<BuildDependencies>
<Dependency>gtk-doc</Dependency>
<Dependency>glib2-devel</Dependency>
@@ -21,12 +21,12 @@
<Dependency versionFrom="6.9.0">qt6-base-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>menu-cache-1.1.0-0001-Support-gcc10-compilation.patch</Patch> -->
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
<Package>
<Name>menu-cache</Name>
<Summary>Development headers for libfm-qt</Summary>
<RuntimeDependencies>
<Dependency>glib2</Dependency>
<Dependency>libfm-extra</Dependency>
@@ -37,6 +37,7 @@
<Path fileType="data">/usr/share</Path>
</Files>
</Package>
<Package>
<Name>menu-cache-devel</Name>
<Summary>Development files for menu-cache</Summary>
@@ -46,9 +47,10 @@
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
</Files>
</Package>
<History>
<Update release="14">
<Date>2025-05-15</Date>
+1 -1
View File
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import shelltools
from pisi.actionsapi import cmaketools
+5 -8
View File
@@ -3,12 +3,12 @@
<PISI>
<Source>
<Name>crow-translate</Name>
<Homepage>https://crow-translate.github.io/</Homepage>
<Homepage>https://apps.kde.org/crowtranslate/</Homepage>
<Packager>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Packager>
<License>GPL3</License>
<License>GPLv3</License>
<Icon>crow-translate</Icon>
<Summary>A simple and lightweight translator</Summary>
<Description>A simple and lightweight translator that allows you to translate and speak text using Google, Yandex Bing, LibreTranslate and Lingva.</Description>
@@ -19,22 +19,20 @@
<Dependency>doxygen</Dependency>
<Dependency>icoutils</Dependency>
<Dependency>dbus-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>qt5-linguist</Dependency>
<Dependency>qt5-svg-devel</Dependency>
<Dependency>openssl-devel</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>tesseract-devel</Dependency>
<Dependency>gst-plugins-good</Dependency>
<Dependency>icon-theme-hicolor</Dependency>
<Dependency>qt5-x11extras-devel</Dependency>
<!-- <Dependency>kwayland-devel</Dependency> -->
<!-- <Dependency>qt5-networkauth-devel</Dependency> -->
<Dependency>extra-cmake-modules</Dependency>
<Dependency>qt5-multimedia-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch></Patch> -->
<!-- <Patch level="1"></Patch> -->
</Patches>
</Source>
@@ -45,7 +43,6 @@
<Dependency>libgcc</Dependency>
<Dependency>libxcb</Dependency>
<Dependency>qt5-base</Dependency>
<!-- <Dependency>kwayland</Dependency> -->
<Dependency>tesseract</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>qt5-multimedia</Dependency>
@@ -59,7 +56,7 @@
<History>
<Update release="1">
<Date>2024-03-16</Date>
<Version>2.11.1</Version>.
<Version>2.11.1</Version>
<Comment>First Release</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
+3 -2
View File
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
@@ -19,4 +19,5 @@ def check():
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("ChangeLog", "COPYING", "TODO*", "NEWS", "README")
pisitools.dodoc("COPYING", "README")
+13 -6
View File
@@ -1,18 +1,18 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>cln</Name>
<Homepage>http://www.ginac.de/CLN/</Homepage>
<Homepage>https://www.ginac.de/CLN/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<IsA>library</IsA>
<Summary>A class library (C++) for numbers</Summary>
<Summary>A class library (C++) for numbers.</Summary>
<Description>cln is a library for efficient computations with all kinds of numbers in arbitrary precision.</Description>
<Archive sha1sum="144f15a57f4b25ada0f10ff28458de03578f6f16" type="tarbz2">http://www.ginac.de/CLN/cln-1.3.6.tar.bz2</Archive>
<Archive sha1sum="17cf2c60e262e30f57caae39692fce7917e11d95" type="tarbz2">https://www.ginac.de/CLN/cln-1.3.7.tar.bz2</Archive>
<BuildDependencies>
<Dependency>gmp-devel</Dependency>
</BuildDependencies>
@@ -37,8 +37,8 @@
<Name>cln-devel</Name>
<Summary>Development files for cln</Summary>
<RuntimeDependencies>
<Dependency release="current">cln</Dependency>
<Dependency>gmp-devel</Dependency>
<Dependency release="current">cln</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
@@ -47,6 +47,13 @@
</Package>
<History>
<Update release="6">
<Date>2025-07-03</Date>
<Version>1.3.7</Version>
<Comment>Version bump.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2020-01-11</Date>
<Version>1.3.6</Version>
@@ -83,4 +90,4 @@
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>