Ticket #54017: patch-libqgpgme-name.diff

File patch-libqgpgme-name.diff, 11.9 KB (added by RJVB (René Bertin), 8 years ago)

  • lang/qt/src/Makefile.am 

    diff --git lang/qt/src/Makefile.am lang/qt/src/Makefile.am
index 87e2ec2..71df154 100644
     
    1717# along with this program; if not, write to the Free Software
    1818# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    1919# 02111-1307, USA
    20 lib_LTLIBRARIES = libqgpgme.la
     20lib_LTLIBRARIES = libQt5GpgME.la
    2121EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \
    2222             gpgme_backend_debug.h qgpgme_version.h.in \
    2323             QGpgmeConfig.cmake.in.in
    … … camelcaseincludedir = $(includedir)/QGpgME 
    209209camelcaseinclude_HEADERS = $(camelcase_headers)
    210210nodist_qgpgmeinclude_HEADERS = qgpgme_version.h
    211211
    212 libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
     212libQt5GpgME_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
    213213
    214214AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
    215215              @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
    216216              -DBUILDING_QGPGME
    217217
    218 libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
     218libQt5GpgME_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
    219219                       @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@
    220 libqgpgme_la_LDFLAGS = -no-undefined -version-info \
     220libQt5GpgME_la_LDFLAGS = -no-undefined -version-info \
    221221    @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@
    222222
    223223if HAVE_W32_SYSTEM
    … … CLEANFILES = $(qgpgme_moc_sources) $(camelcase_headers) QGpgmeConfig.cmake \ 
    258258             qgpgme_version.h QGpgmeConfig.cmake.in \
    259259             QGpgmeConfigVersion.cmake
    260260
    261 nodist_libqgpgme_la_SOURCES = $(qgpgme_moc_sources)
     261nodist_libQt5GpgME_la_SOURCES = $(qgpgme_moc_sources)
    262262
    263263.h.moc:
    264264        $(MOC) `test -f '$<' || echo '$(srcdir)/'`$< -o $@

  • lang/qt/src/Makefile.in 

    diff --git lang/qt/src/Makefile.in lang/qt/src/Makefile.in
index 5b87f6e..14c4880 100644
    am__installdirs = "$(DESTDIR)$(libdir)" \ 
    138138        "$(DESTDIR)$(qgpgmeincludedir)" \
    139139        "$(DESTDIR)$(qgpgmeincludedir)"
    140140LTLIBRARIES = $(lib_LTLIBRARIES)
    141 libqgpgme_la_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
     141libQt5GpgME_la_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    142142        ../../../src/libgpgme.la
    143143am__objects_1 = dataprovider.lo job.lo multideletejob.lo \
    144144        qgpgmeadduseridjob.lo qgpgmebackend.lo \
    … … am__objects_1 = dataprovider.lo job.lo multideletejob.lo \ 
    156156        gpgme_backend_debug.lo qgpgmetofupolicyjob.lo \
    157157        defaultkeygenerationjob.lo qgpgmewkspublishjob.lo dn.lo
    158158am__objects_2 =
    159 am_libqgpgme_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
     159am_libQt5GpgME_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
    160160        $(am__objects_2)
    161 nodist_libqgpgme_la_OBJECTS = $(am__objects_2)
    162 libqgpgme_la_OBJECTS = $(am_libqgpgme_la_OBJECTS) \
    163         $(nodist_libqgpgme_la_OBJECTS)
     161nodist_libQt5GpgME_la_OBJECTS = $(am__objects_2)
     162libQt5GpgME_la_OBJECTS = $(am_libQt5GpgME_la_OBJECTS) \
     163        $(nodist_libQt5GpgME_la_OBJECTS)
    164164AM_V_lt = $(am__v_lt_@AM_V@)
    165165am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
    166166am__v_lt_0 = --silent
    167167am__v_lt_1 =
    168 libqgpgme_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     168libQt5GpgME_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
    169169        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
    170         $(CXXFLAGS) $(libqgpgme_la_LDFLAGS) $(LDFLAGS) -o $@
     170        $(CXXFLAGS) $(libQt5GpgME_la_LDFLAGS) $(LDFLAGS) -o $@
    171171AM_V_P = $(am__v_P_@AM_V@)
    172172am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    173173am__v_P_0 = false
    … … AM_V_CCLD = $(am__v_CCLD_@AM_V@) 
    220220am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    221221am__v_CCLD_0 = @echo "  CCLD    " $@;
    222222am__v_CCLD_1 =
    223 SOURCES = $(libqgpgme_la_SOURCES) $(nodist_libqgpgme_la_SOURCES)
    224 DIST_SOURCES = $(libqgpgme_la_SOURCES)
     223SOURCES = $(libQt5GpgME_la_SOURCES) $(nodist_libQt5GpgME_la_SOURCES)
     224DIST_SOURCES = $(libQt5GpgME_la_SOURCES)
    225225am__can_run_installinfo = \
    226226  case $$AM_UPDATE_INFO_DIR in \
    227227    n|no|NO) false;; \
    … … top_srcdir = @top_srcdir@ 
    464464# along with this program; if not, write to the Free Software
    465465# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    466466# 02111-1307, USA
    467 lib_LTLIBRARIES = libqgpgme.la
     467lib_LTLIBRARIES = libQt5GpgME.la
    468468EXTRA_DIST = QGpgmeConfig.cmake.in.in QGpgmeConfigVersion.cmake.in \
    469469             gpgme_backend_debug.h qgpgme_version.h.in \
    470470             QGpgmeConfig.cmake.in.in
    … … qgpgmeinclude_HEADERS = $(qgpgme_headers) 
    656656camelcaseincludedir = $(includedir)/QGpgME
    657657camelcaseinclude_HEADERS = $(camelcase_headers)
    658658nodist_qgpgmeinclude_HEADERS = qgpgme_version.h
    659 libqgpgme_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
     659libQt5GpgME_la_SOURCES = $(qgpgme_sources) $(qgpgme_headers) $(private_qgpgme_headers)
    660660AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
    661661              @GPGME_QT_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
    662662              -DBUILDING_QGPGME
    663663
    664 libqgpgme_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
     664libQt5GpgME_la_LIBADD = ../../cpp/src/libgpgmepp.la ../../../src/libgpgme.la \
    665665                       @LIBASSUAN_LIBS@ @GPGME_QT_LIBS@
    666666
    667 libqgpgme_la_LDFLAGS = -no-undefined -version-info \
     667libQt5GpgME_la_LDFLAGS = -no-undefined -version-info \
    668668    @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@
    669669
    670670BUILT_SOURCES = $(qgpgme_moc_sources) $(camelcase_headers)
    … … CLEANFILES = $(qgpgme_moc_sources) $(camelcase_headers) QGpgmeConfig.cmake \ 
    672672             qgpgme_version.h QGpgmeConfig.cmake.in \
    673673             QGpgmeConfigVersion.cmake
    674674
    675 nodist_libqgpgme_la_SOURCES = $(qgpgme_moc_sources)
     675nodist_libQt5GpgME_la_SOURCES = $(qgpgme_moc_sources)
    676676all: $(BUILT_SOURCES)
    677677        $(MAKE) $(AM_MAKEFLAGS) all-am
    678678
    … … clean-libLTLIBRARIES: 
    752752          rm -f $${locs}; \
    753753        }
    754754
    755 libqgpgme.la: $(libqgpgme_la_OBJECTS) $(libqgpgme_la_DEPENDENCIES) $(EXTRA_libqgpgme_la_DEPENDENCIES)
    756         $(AM_V_CXXLD)$(libqgpgme_la_LINK) -rpath $(libdir) $(libqgpgme_la_OBJECTS) $(libqgpgme_la_LIBADD) $(LIBS)
     755libQt5GpgME.la: $(libQt5GpgME_la_OBJECTS) $(libQt5GpgME_la_DEPENDENCIES) $(EXTRA_libQt5GpgME_la_DEPENDENCIES)
     756        $(AM_V_CXXLD)$(libQt5GpgME_la_LINK) -rpath $(libdir) $(libQt5GpgME_la_OBJECTS) $(libQt5GpgME_la_LIBADD) $(LIBS)
    757757
    758758mostlyclean-compile:
    759759        -rm -f *.$(OBJEXT)

  • lang/qt/src/QGpgmeConfig-w32.cmake.in.in 

    diff --git lang/qt/src/QGpgmeConfig-w32.cmake.in.in lang/qt/src/QGpgmeConfig-w32.cmake.in.in
index b897805..579b23e 100644
    unset(_expectedTargets) 
    6262add_library(QGpgme SHARED IMPORTED)
    6363
    6464set_target_properties(QGpgme PROPERTIES
    65   IMPORTED_IMPLIB_RELEASE "@resolved_libdir@/libqgpgme.dll.a"
     65  IMPORTED_IMPLIB_RELEASE "@resolved_libdir@/libQt5GpgME.dll.a"
    6666  INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@"
    6767  INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
    68   IMPORTED_LOCATION "@resolved_libdir@/libqgpgme-7.dll"
     68  IMPORTED_LOCATION "@resolved_libdir@/libQt5GpgME-7.dll"
    6969)
    7070
    7171list(APPEND _IMPORT_CHECK_TARGETS QGgpme )
    72 list(APPEND _IMPORT_CHECK_FILES_FOR_Qgpgme "@resolved_libdir@/libqgpgme.dll.a" "@resolved_bindir@/libqgpgme-7.dll" )
     72list(APPEND _IMPORT_CHECK_FILES_FOR_Qgpgme "@resolved_libdir@/libQt5GpgME.dll.a" "@resolved_bindir@/libQt5GpgME-7.dll" )
    7373
    7474if(CMAKE_VERSION VERSION_LESS 2.8.12)
    7575  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")

  • lang/qt/src/QGpgmeConfig.cmake.in.in 

    diff --git lang/qt/src/QGpgmeConfig.cmake.in.in lang/qt/src/QGpgmeConfig.cmake.in.in
index 88ed242..e381ef4 100644
    add_library(QGpgme SHARED IMPORTED) 
    6464set_target_properties(QGpgme PROPERTIES
    6565  INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/qgpgme;@resolved_includedir@"
    6666  INTERFACE_LINK_LIBRARIES "Gpgmepp;Qt5::Core"
    67   IMPORTED_LOCATION "@resolved_libdir@/libqgpgme@libsuffix@"
     67  IMPORTED_LOCATION "@resolved_libdir@/libQt5GpgME@libsuffix@"
    6868)
    6969
    7070if(CMAKE_VERSION VERSION_LESS 2.8.12)

  • lang/qt/tests/Makefile.am 

    diff --git lang/qt/tests/Makefile.am lang/qt/tests/Makefile.am
index ad08ad4..b3f574a 100644
    moc_files = t-keylist.moc t-keylocate.moc t-ownertrust.moc t-tofuinfo.moc \ 
    3232
    3333AM_LDFLAGS = -no-install
    3434
    35 LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
     35LDADD = ../../cpp/src/libgpgmepp.la ../src/libQt5GpgME.la \
    3636        ../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
    3737        @GPGME_QTTEST_LIBS@ -lstdc++
    3838

  • lang/qt/tests/Makefile.in 

    diff --git lang/qt/tests/Makefile.in lang/qt/tests/Makefile.in
index e0ac22e..788ed6d 100644
     
    130130run_keyformailboxjob_OBJECTS = $(am_run_keyformailboxjob_OBJECTS)
    131131run_keyformailboxjob_LDADD = $(LDADD)
    132132run_keyformailboxjob_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    133         ../src/libqgpgme.la ../../../src/libgpgme.la
     133        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    134134AM_V_lt = $(am__v_lt_@AM_V@)
    135135am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
    136136am__v_lt_0 = --silent
    … …  
    140140t_config_OBJECTS = $(am_t_config_OBJECTS)
    141141t_config_LDADD = $(LDADD)
    142142t_config_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    143         ../src/libqgpgme.la ../../../src/libgpgme.la
     143        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    144144am_t_encrypt_OBJECTS = t-encrypt.$(OBJEXT) $(am__objects_1)
    145145t_encrypt_OBJECTS = $(am_t_encrypt_OBJECTS)
    146146t_encrypt_LDADD = $(LDADD)
    147147t_encrypt_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    148         ../src/libqgpgme.la ../../../src/libgpgme.la
     148        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    149149am_t_keylist_OBJECTS = t-keylist.$(OBJEXT) $(am__objects_1)
    150150am__objects_2 =
    151151nodist_t_keylist_OBJECTS = $(am__objects_2)
    … …  
    153153        $(nodist_t_keylist_OBJECTS)
    154154t_keylist_LDADD = $(LDADD)
    155155t_keylist_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    156         ../src/libqgpgme.la ../../../src/libgpgme.la
     156        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    157157am_t_keylocate_OBJECTS = t-keylocate.$(OBJEXT) $(am__objects_1)
    158158t_keylocate_OBJECTS = $(am_t_keylocate_OBJECTS)
    159159t_keylocate_LDADD = $(LDADD)
    160160t_keylocate_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    161         ../src/libqgpgme.la ../../../src/libgpgme.la
     161        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    162162am_t_ownertrust_OBJECTS = t-ownertrust.$(OBJEXT) $(am__objects_1)
    163163t_ownertrust_OBJECTS = $(am_t_ownertrust_OBJECTS)
    164164t_ownertrust_LDADD = $(LDADD)
    165165t_ownertrust_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    166         ../src/libqgpgme.la ../../../src/libgpgme.la
     166        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    167167am_t_tofuinfo_OBJECTS = t-tofuinfo.$(OBJEXT) $(am__objects_1)
    168168t_tofuinfo_OBJECTS = $(am_t_tofuinfo_OBJECTS)
    169169t_tofuinfo_LDADD = $(LDADD)
    170170t_tofuinfo_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    171         ../src/libqgpgme.la ../../../src/libgpgme.la
     171        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    172172am_t_various_OBJECTS = t-various.$(OBJEXT) $(am__objects_1)
    173173t_various_OBJECTS = $(am_t_various_OBJECTS)
    174174t_various_LDADD = $(LDADD)
    175175t_various_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    176         ../src/libqgpgme.la ../../../src/libgpgme.la
     176        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    177177am_t_verify_OBJECTS = t-verify.$(OBJEXT) $(am__objects_1)
    178178t_verify_OBJECTS = $(am_t_verify_OBJECTS)
    179179t_verify_LDADD = $(LDADD)
    180180t_verify_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    181         ../src/libqgpgme.la ../../../src/libgpgme.la
     181        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    182182am_t_wkspublish_OBJECTS = t-wkspublish.$(OBJEXT) $(am__objects_1)
    183183t_wkspublish_OBJECTS = $(am_t_wkspublish_OBJECTS)
    184184t_wkspublish_LDADD = $(LDADD)
    185185t_wkspublish_DEPENDENCIES = ../../cpp/src/libgpgmepp.la \
    186         ../src/libqgpgme.la ../../../src/libgpgme.la
     186        ../src/libQt5GpgME.la ../../../src/libgpgme.la
    187187AM_V_P = $(am__v_P_@AM_V@)
    188188am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    189189am__v_P_0 = false
    … …  
    497497            t-various.moc t-config.moc
    498498
    499499AM_LDFLAGS = -no-install
    500 LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
     500LDADD = ../../cpp/src/libgpgmepp.la ../src/libQt5GpgME.la \
    501501        ../../../src/libgpgme.la @GPGME_QT_LIBS@ @GPG_ERROR_LIBS@ \
    502502        @GPGME_QTTEST_LIBS@ -lstdc++
    503503