[arch-commits] Commit in menu-cache/repos/community-x86_64 (4 files)
Allan McRae
allan at gemini.archlinux.org
Mon Apr 25 03:47:11 UTC 2022
Date: Monday, April 25, 2022 @ 03:47:11
Author: allan
Revision: 1189864
archrelease: copy trunk to community-x86_64
Added:
menu-cache/repos/community-x86_64/PKGBUILD
(from rev 1189863, menu-cache/trunk/PKGBUILD)
menu-cache/repos/community-x86_64/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch
(from rev 1189863, menu-cache/trunk/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch)
Deleted:
menu-cache/repos/community-x86_64/PKGBUILD
menu-cache/repos/community-x86_64/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch
-------------------------------------------------------+
PKGBUILD | 74 ++---
menu-cache-1.1.0-0001-Support-gcc10-compilation.patch | 216 ++++++++--------
2 files changed, 145 insertions(+), 145 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-25 03:46:50 UTC (rev 1189863)
+++ PKGBUILD 2022-04-25 03:47:11 UTC (rev 1189864)
@@ -1,37 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Juergen Hoetzel <juergen at archlinux.org>
-
-pkgname=menu-cache
-pkgver=1.1.0
-pkgrel=2
-pkgdesc='Caching mechanism for freedesktop.org compliant menus'
-arch=('x86_64')
-license=('GPL2')
-url='https://lxde.org/'
-depends=('libfm-extra')
-makedepends=('gtk-doc')
-source=(https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz
- menu-cache-1.1.0-0001-Support-gcc10-compilation.patch)
-sha256sums=('ed02eb459dcb398f69b9fa5bf4dd813020405afc84331115469cdf7be9273ec7'
- '393723ca805cb5ffb5eee2ad00a1c4624b513ca72bfb6a880d71907fb96e83de')
-
-prepare() {
- cd $pkgname-$pkgver
- # Fix build (taken from Fedora)
- patch -Np1 -i ../menu-cache-1.1.0-0001-Support-gcc10-compilation.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --enable-gtk-doc
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: menu-cache/repos/community-x86_64/PKGBUILD (from rev 1189863, menu-cache/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-25 03:47:11 UTC (rev 1189864)
@@ -0,0 +1,37 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at archlinux.org>
+
+pkgname=menu-cache
+pkgver=1.1.0
+pkgrel=3
+pkgdesc='Caching mechanism for freedesktop.org compliant menus'
+arch=('x86_64')
+license=('GPL2')
+url='https://lxde.org/'
+depends=('libfm-extra')
+makedepends=('gtk-doc')
+source=(https://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.xz
+ menu-cache-1.1.0-0001-Support-gcc10-compilation.patch)
+sha256sums=('ed02eb459dcb398f69b9fa5bf4dd813020405afc84331115469cdf7be9273ec7'
+ '393723ca805cb5ffb5eee2ad00a1c4624b513ca72bfb6a880d71907fb96e83de')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # Fix build (taken from Fedora)
+ patch -Np1 -i ../menu-cache-1.1.0-0001-Support-gcc10-compilation.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --enable-gtk-doc
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: menu-cache-1.1.0-0001-Support-gcc10-compilation.patch
===================================================================
--- menu-cache-1.1.0-0001-Support-gcc10-compilation.patch 2022-04-25 03:46:50 UTC (rev 1189863)
+++ menu-cache-1.1.0-0001-Support-gcc10-compilation.patch 2022-04-25 03:47:11 UTC (rev 1189864)
@@ -1,108 +0,0 @@
-From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka at 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
-
Copied: menu-cache/repos/community-x86_64/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch (from rev 1189863, menu-cache/trunk/menu-cache-1.1.0-0001-Support-gcc10-compilation.patch)
===================================================================
--- menu-cache-1.1.0-0001-Support-gcc10-compilation.patch (rev 0)
+++ menu-cache-1.1.0-0001-Support-gcc10-compilation.patch 2022-04-25 03:47:11 UTC (rev 1189864)
@@ -0,0 +1,108 @@
+From 1ce739649b4d66339a03fc0ec9ee7a2f7c141780 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at 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
+
More information about the arch-commits
mailing list