From f0188281c263f03a43362e94f9666a03c62ba359 Mon Sep 17 00:00:00 2001
From: Andre Miranda <andre42m@gmail.com>
Date: Tue, 2 May 2017 23:38:10 -0300
Subject: [PATCH] Bump thunarx api version to 3
---
configure.ac.in | 4 ++--
thunarx/Makefile.am | 12 ++++++------
thunarx/abicheck.sh | 2 +-
thunarx/{thunarx-2.pc.in => thunarx-3.pc.in} | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
rename thunarx/{thunarx-2.pc.in => thunarx-3.pc.in} (92%)
diff --git a/configure.ac.in b/configure.ac.in
index 613650c62..e543ffad4 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -23,7 +23,7 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
m4_define([thunarx_verinfo], [0:0:0])
-m4_define([thunarx_version_api], [2])
+m4_define([thunarx_version_api], [3])
m4_define([thunar_version_major], [1])
m4_define([thunar_version_minor], [6])
m4_define([thunar_version_micro], [12])
@@ -236,7 +236,7 @@ plugins/thunar-wallpaper/Makefile
po/Makefile.in
thunar/Makefile
thunarx/Makefile
-thunarx/thunarx-2.pc
+thunarx/thunarx-3.pc
thunarx/thunarx-config.h
])
diff --git a/thunarx/Makefile.am b/thunarx/Makefile.am
index c58deed04..a992f9296 100644
--- a/thunarx/Makefile.am
+++ b/thunarx/Makefile.am
@@ -25,9 +25,9 @@ libthunarx_include_HEADERS = \
$(libthunarx_headers)
lib_LTLIBRARIES = \
- libthunarx-2.la
+ libthunarx-3.la
-libthunarx_2_la_SOURCES = \
+libthunarx_3_la_SOURCES = \
$(libthunarx_headers) \
thunarx-config.c \
thunarx-file-info.c \
@@ -44,28 +44,28 @@ libthunarx_2_la_SOURCES = \
thunarx-renamer.c \
thunarx-renamer-provider.c
-libthunarx_2_la_CFLAGS = \
+libthunarx_3_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
$(GMODULE_CFLAGS) \
$(PLATFORM_CFLAGS)
-libthunarx_2_la_LDFLAGS = \
+libthunarx_3_la_LDFLAGS = \
-export-dynamic \
-export-symbols-regex "^[^_].*" \
-no-undefined \
-version-info $(THUNARX_VERINFO) \
$(PLATFORM_LDFLAGS)
-libthunarx_2_la_LIBADD = \
+libthunarx_3_la_LIBADD = \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
$(GIO_LIBS) \
$(GTK_LIBS)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = thunarx-2.pc
+pkgconfig_DATA = thunarx-3.pc
EXTRA_DIST = \
abicheck.sh \
diff --git a/thunarx/abicheck.sh b/thunarx/abicheck.sh
index 62c316295..1e7812ab5 100755
--- a/thunarx/abicheck.sh
+++ b/thunarx/abicheck.sh
@@ -20,5 +20,5 @@
trap 'rm expected-abi actual-abi' EXIT
${CPP:-cpp} -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/thunarx.symbols | sed 's/ G_GNUC.*$//;s/ PRIVATE//;/^ *$/d;/^#/d' | sort >expected-abi
-${NM:-nm} -D -g -P .libs/libthunarx-2.so | awk '$2~/^[DRTG]$/&&$1~/^[^_]/{print $1}' | sort >actual-abi
+${NM:-nm} -D -g -P .libs/libthunarx-3.so | awk '$2~/^[DRTG]$/&&$1~/^[^_]/{print $1}' | sort >actual-abi
diff -u expected-abi actual-abi
diff --git a/thunarx/thunarx-2.pc.in b/thunarx/thunarx-3.pc.in
similarity index 92%
rename from thunarx/thunarx-2.pc.in
rename to thunarx/thunarx-3.pc.in
index 8dea27179..15e6d329d 100644
--- a/thunarx/thunarx-2.pc.in
+++ b/thunarx/thunarx-3.pc.in
@@ -7,7 +7,7 @@ extensionsdir=${libdir}/thunarx-@THUNARX_VERSION_API@
Name: thunarx
Description: A library to create Thunar extensions
-Requires: gtk+-2.0 gio-2.0
+Requires: gtk+-3.0 gio-2.0
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lthunarx-@THUNARX_VERSION_API@
Cflags: -I${includedir}/thunarx-@THUNARX_VERSION_API@
--
GitLab