Control: tags -1 patch
On Fri, Aug 17, 2018 at 07:20:56PM +0000, Santiago Vila wrote:
>...
> gcc -DHAVE_CONFIG_H -I. -I.. -I.. -DICONDIR="\"/usr/share/pixmaps\""
> -DFLORENCELOCALEDIR=\""/usr/share/locale"\"
> -DDATADIR="\"/usr/share/florence\"" -pthread -I/usr/include/librsvg-2.0
> -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/cairo
> -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2
> -I/usr/include/libpng16 -I/usr/include/libxml2 -I/usr/include/gstreamer-1.0
> -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread
> -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0
> -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0
> -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0
> -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0
> -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi
> -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1
> -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16
> -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0
> -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread
> -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0
> -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/at-spi-2.0
> -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include
> -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
> -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=.
> -fstack-protector-strong -Wformat -Werror=format-security -c -o
> florence-ramble.o `test -f 'ramble.c' || echo './'`ramble.c
> /bin/bash ../libtool --tag=CC --mode=link gcc -g -O2
> -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat
> -Werror=format-security -Wl,-z,relro -o florence florence-main.o
> florence-florence.o florence-keyboard.o florence-key.o florence-trace.o
> florence-settings.o florence-trayicon.o florence-layoutreader.o
> florence-style.o florence-view.o florence-status.o florence-tools.o
> florence-settings-window.o florence-xkeyboard.o florence-fsm.o
> florence-service.o florence-controller.o florence-menu.o florence-ramble.o
> -lXext -Wl,--export-dynamic -lgmodule-2.0 -pthread -lrsvg-2 -lm -lgio-2.0
> -lgdk_pixbuf-2.0 -lcairo -lxml2 -lgstreamer-1.0 -lgobject-2.0 -lglib-2.0 -lm
> -lX11 -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lXtst
> -latspi -ldbus-1 -lglib-2.0 -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0
> -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0
> -lglib-2.0 -lflorence-1.0
> libtool: link: gcc -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=.
> -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -o
> florence florence-main.o florence-florence.o florence-keyboard.o
> florence-key.o florence-trace.o florence-settings.o florence-trayicon.o
> florence-layoutreader.o florence-style.o florence-view.o florence-status.o
> florence-tools.o florence-settings-window.o florence-xkeyboard.o
> florence-fsm.o florence-service.o florence-controller.o florence-menu.o
> florence-ramble.o -Wl,--export-dynamic -pthread -lXext -lgmodule-2.0
> -lrsvg-2 -lxml2 -lgstreamer-1.0 -lm -lX11 -lnotify -lXtst -latspi -ldbus-1
> -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject
> -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lflorence-1.0
> -pthread
> /usr/bin/ld: cannot find -lflorence-1.0
> collect2: error: ld returned 1 exit status
> make[3]: *** [Makefile:595: florence] Error 1
>...
A fix is attached.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
Description: Fix the Makefile dependencies
Author: Adrian Bunk <[email protected]>
Bug-Debian: https://bugs.debian.org/906461
--- florence-0.6.3.orig/src/Makefile.am
+++ florence-0.6.3/src/Makefile.am
@@ -16,7 +16,7 @@ florence_CPPFLAGS = -I$(top_srcdir) -DIC
-DDATADIR="\"$(datadir)/florence\"" $(DEPS_CFLAGS) $(GTK3_CFLAGS)\
$(LIBGNOME_CFLAGS) $(LIBNOTIFY_CFLAGS) $(XTST_CFLAGS) $(AT_SPI2_CFLAGS) $(INCLUDES)
florence_LDADD = $(DEPS_LIBS) $(LIBM) $(X11_LIBS) $(LIBGNOME_LIBS) $(LIBNOTIFY_LIBS)\
- $(XTST_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) -lflorence-1.0
+ $(XTST_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) libflorence-1.0.la
libflorence_1_0_la_SOURCES = lib/florence.c
library_includedir=$(includedir)/florence-1.0