pool/gbrainy
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53bf763300
gbrainy/gbrainy-use-libexecdir.patch
Bjørn Lie 4ac90c8d01 Accepting request 687063 from home:iznogood:branches:GNOME:Apps 
- Update to version 2.4.0:
  + 2 bug fixes in games.
  + Several fixes in the build system.
  + Updated translations.
- Changes from version 2.3.9:
  + 2 bug fixes in games.
  + Updated translations.
- Changes from version 2.3.8:
  + Fixes bug with librsvg that prevented gbrainy from getting
    started.
- Refresh patch with refresh_patches service.
- Remove conditional for t-u-u and macro.

OBS-URL: https://build.opensuse.org/request/show/687063
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=85
2019-03-22 16:50:31 +00:00

142 lines
5.8 KiB
Diff
Raw Blame History

Index: gbrainy-2.4.0/src/Clients/Classical/Makefile.am
===================================================================
--- gbrainy-2.4.0.orig/src/Clients/Classical/Makefile.am 2019-01-13 23:30:19.000000000 +0100
+++ gbrainy-2.4.0/src/Clients/Classical/Makefile.am 2019-03-20 23:01:36.221865097 +0100
@@ -46,7 +46,7 @@ RESOURCES = \
-resource:$(top_srcdir)/data/app-graphics/gtk-stop.svg \
-resource:$(top_srcdir)/data/app-graphics/gtk-ok.svg
-gbrainydir = $(libdir)/gbrainy
+gbrainydir = $(pkglibexecdir)
gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config
bin_SCRIPTS = gbrainy
Index: gbrainy-2.4.0/src/Clients/Classical/gbrainy.in
===================================================================
--- gbrainy-2.4.0.orig/src/Clients/Classical/gbrainy.in 2019-01-09 07:03:35.000000000 +0100
+++ gbrainy-2.4.0/src/Clients/Classical/gbrainy.in 2019-03-20 23:01:36.221865097 +0100
@@ -1,10 +1,8 @@
#!/bin/bash
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
+pkglibexecdir=@libexecdir@/@PACKAGE@
-MONO_EXE="$libdir/gbrainy/gbrainy.exe"
+MONO_EXE="$pkglibexecdir/gbrainy.exe"
for arg in $*; do
case "x--debug" in ("x${arg}")
Index: gbrainy-2.4.0/src/Core/Makefile.am
===================================================================
--- gbrainy-2.4.0.orig/src/Core/Makefile.am 2019-01-09 07:03:35.000000000 +0100
+++ gbrainy-2.4.0/src/Core/Makefile.am 2019-03-20 23:01:36.221865097 +0100
@@ -104,19 +104,19 @@ $(TARGET): $(CSFILES) $(RES)
$(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES)
$(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in
- sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \
< $< > $@
all: $(TARGET) $(TARGET_CFG)
install-data-local: $(TARGET) $(TARGET_CFG)
- $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir)
- $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir)
+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir)
+ $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir)
uninstall-local:
- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll
- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config
+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll
+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config
EXTRA_DIST = \
$(CSDISTFILES) $(RES) gbrainy.Core.dll.config.in
Index: gbrainy-2.4.0/src/Core/Makefile.in
===================================================================
--- gbrainy-2.4.0.orig/src/Core/Makefile.in 2019-03-19 13:44:07.000000000 +0100
+++ gbrainy-2.4.0/src/Core/Makefile.in 2019-03-20 23:01:36.221865097 +0100
@@ -607,19 +607,19 @@ $(TARGET): $(CSFILES) $(RES)
$(CSC) -out:$@ $(CSFLAGS) $(REFS) $(RES_CSFLAGS) $(CSFILES)
$(TARGET_CFG): $(srcdir)/gbrainy.Core.dll.config.in
- sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \
< $< > $@
all: $(TARGET) $(TARGET_CFG)
install-data-local: $(TARGET) $(TARGET_CFG)
- $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir)
- $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibdir)
+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir)
+ $(INSTALL_DATA) $(TARGET_CFG) $(DESTDIR)$(pkglibexecdir)
uninstall-local:
- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll
- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Core.dll.config
+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll
+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Core.dll.config
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: gbrainy-2.4.0/src/Games/Makefile.am
===================================================================
--- gbrainy-2.4.0.orig/src/Games/Makefile.am 2019-01-09 07:03:35.000000000 +0100
+++ gbrainy-2.4.0/src/Games/Makefile.am 2019-03-20 23:01:36.221865097 +0100
@@ -113,11 +113,11 @@ $(TARGET): $(CSFILES) $(RES)
all: $(TARGET)
install-data-local: $(TARGET)
- $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir)
+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir)
uninstall-local:
- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll
+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll
EXTRA_DIST = \
$(CSDISTFILES) $(RES)
Index: gbrainy-2.4.0/src/Games/Makefile.in
===================================================================
--- gbrainy-2.4.0.orig/src/Games/Makefile.in 2019-03-19 13:44:07.000000000 +0100
+++ gbrainy-2.4.0/src/Games/Makefile.in 2019-03-20 23:01:36.221865097 +0100
@@ -615,11 +615,11 @@ $(TARGET): $(CSFILES) $(RES)
all: $(TARGET)
install-data-local: $(TARGET)
- $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibdir)
+ $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir)
+ $(INSTALL_DATA) $(TARGET) $(DESTDIR)$(pkglibexecdir)
uninstall-local:
- cd $(DESTDIR)$(pkglibdir) && rm -f gbrainy.Games.dll
+ cd $(DESTDIR)$(pkglibexecdir) && rm -f gbrainy.Games.dll
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: gbrainy-2.4.0/src/Clients/Classical/Makefile.in
===================================================================
--- gbrainy-2.4.0.orig/src/Clients/Classical/Makefile.in 2019-03-19 13:44:07.000000000 +0100
+++ gbrainy-2.4.0/src/Clients/Classical/Makefile.in 2019-03-20 23:01:36.221865097 +0100
@@ -374,7 +374,7 @@ RESOURCES = \
-resource:$(top_srcdir)/data/app-graphics/gtk-stop.svg \
-resource:$(top_srcdir)/data/app-graphics/gtk-ok.svg
-gbrainydir = $(libdir)/gbrainy
+gbrainydir = $(pkglibexecdir)
gbrainy_SCRIPTS = ../../gbrainy.exe ../../gbrainy.exe.config
bin_SCRIPTS = gbrainy
GBRAINY_CSFILES = $(GBRAINY_CSDISTFILES) \
Reference in New Issue View Git Blame Copy Permalink