diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/pinball-src-deps.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/patches/pinball-src-deps.patch')
| -rw-r--r-- | gnu/packages/patches/pinball-src-deps.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/gnu/packages/patches/pinball-src-deps.patch b/gnu/packages/patches/pinball-src-deps.patch deleted file mode 100644 index 3ab806bae9..0000000000 --- a/gnu/packages/patches/pinball-src-deps.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fixes error during make: - -"No rule to make target '../src/libemilia_pin.a', needed by 'pinball'. Stop." - ---- pinball-0.3.1/src/Makefile.in 2003-12-10 05:34:47.000000000 -0600 -+++ pinball-0.3.1/src/Makefile.in 2016-01-31 22:29:13.134519889 -0600 -@@ -116,7 +116,7 @@ - - INCLUDES = -I../base -I../addon @INCLTDL@ - --pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ -+pinball_LDADD = libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@ - pinball_LDFLAGS = -export-dynamic - - pinball_SOURCES = Pinball.cpp -@@ -174,7 +174,7 @@ - - am_pinball_OBJECTS = Pinball.$(OBJEXT) - pinball_OBJECTS = $(am_pinball_OBJECTS) --pinball_DEPENDENCIES = ../src/libemilia_pin.a ../addon/libemilia_addon.a \ -+pinball_DEPENDENCIES = libemilia_pin.a ../addon/libemilia_addon.a \ - ../base/libemilia_base.a - - DEFS = @DEFS@ |