[patch] patch ported from upstream commit

xfce4-verve-plugin-2.0-fix-linker-script-error.patch (text/plain), 1.82 KB, created by Steve Arnold on 2020-10-15 21:22:05 UTC

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9c06433
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,31 @@
+*~
+*.la
+*.lo
+*.gmo
+*.tar.bz2
+.deps
+.libs
+.vscode
+ChangeLog
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+compile
+config.*
+configure
+configure.ac
+depcomp
+install-sh
+intltool-*
+libtool
+ltmain.sh
+m4
+missing
+panel-plugin/weather-config_ui.h
+panel-plugin/weather.desktop
+po/.intltool-merge-cache
+po/Makefile.in.in
+po/POTFILES
+stamp-*
diff --git a/Makefile.am b/Makefile.am
index a6c90af..b3b52a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 @SET_MAKE@
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS =								\
 	panel-plugin							\
 	po
diff --git a/configure.ac b/configure.ac
index e5abf7c..bc0b4a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,8 @@ dnl ********************************
 AC_PROG_CC()
 AC_PROG_LD()
 AC_PROG_INSTALL()
-AC_PROG_INTLTOOL()
+AC_CONFIG_MACRO_DIRS([m4])
+IT_PROG_INTLTOOL([0.35.0])
 
 dnl **************************
 dnl *** Initialize libtool ***
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index cbc5bd5..f0bb638 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -33,6 +33,7 @@ libverve_la_LDFLAGS = \
 	-export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
 	$(PLATFORM_LDFLAGS)
 
+
 # .desktop file
 #
 # We need to let intltool merge the translated fields, so we add a
diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c
index 9bde2cd..a898a21 100644
--- a/panel-plugin/verve-plugin.c
+++ b/panel-plugin/verve-plugin.c
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
 #include <libxfce4ui/libxfce4ui.h>
 
 #include "verve.h"