cairo-dock-core: fix messed up library installation path

This commit is contained in:
Leonid Pliushch 2021-12-05 11:42:33 +02:00 committed by Yaksh Bariya
parent 67653f0210
commit 04bc978525
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
2 changed files with 6 additions and 16 deletions

View File

@ -4,18 +4,11 @@ TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="Yisus7u7 <jesuspixel5@gmail.com>" TERMUX_PKG_MAINTAINER="Yisus7u7 <jesuspixel5@gmail.com>"
TERMUX_PKG_VERSION=3.4.1 TERMUX_PKG_VERSION=3.4.1
_COMMIT=6c569e67a2a366e7634224a0133ede51755629cb _COMMIT=6c569e67a2a366e7634224a0133ede51755629cb
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/Cairo-Dock/cairo-dock-core/archive/${_COMMIT}.zip TERMUX_PKG_SRCURL=https://github.com/Cairo-Dock/cairo-dock-core/archive/${_COMMIT}.zip
TERMUX_PKG_SHA256=e59e99147ce9c901b46d4b56b88bd53aeda34292b86fd9fbf2c55d158153f2ec TERMUX_PKG_SHA256=e59e99147ce9c901b46d4b56b88bd53aeda34292b86fd9fbf2c55d158153f2ec
TERMUX_PKG_DEPENDS="atk, dbus-glib, glib, gtk3, pango, libcairo, libx11, xsltproc, libcurl, gdk-pixbuf, harfbuzz, mesa, glu, librsvg, libxcomposite, libwayland, libwayland-protocols, libxinerama, libxrandr, libxrender, libxtst, libxml2" TERMUX_PKG_DEPENDS="atk, dbus-glib, glib, gtk3, pango, libcairo, libx11, xsltproc, libcurl, gdk-pixbuf, harfbuzz, mesa, glu, librsvg, libxcomposite, libwayland, libwayland-protocols, libxinerama, libxrandr, libxrender, libxtst, libxml2"
TERMUX_PKG_BUILD_DEPENDS="valac" TERMUX_PKG_BUILD_DEPENDS="valac"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DFORCE_NOT_LIB64=yes"
if [ $TERMUX_ARCH == "arm" ]; then
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=\"Release\" -DLIB_SUFFIX=32"
elif [ $TERMUX_ARCH == "i686" ]; then
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=\"Release\" -DLIB_SUFFIX=32"
else
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=\"Release\" -DFORCE_LIB64=yes"
fi
TERMUX_CMAKE_BUILD="Unix Makefiles" TERMUX_CMAKE_BUILD="Unix Makefiles"

View File

@ -1,15 +1,12 @@
diff --git a/src/gldit/CMakeLists.txt b/src/gldit/CMakeLists.txt diff -uNr cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb/src/gldit/CMakeLists.txt cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb.mod/src/gldit/CMakeLists.txt
index f2340f6..6a06806 100644 --- cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb/src/gldit/CMakeLists.txt 2021-03-27 06:23:53.000000000 +0200
--- a/src/gldit/CMakeLists.txt +++ cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb.mod/src/gldit/CMakeLists.txt 2021-12-05 11:40:06.757366142 +0200
+++ b/src/gldit/CMakeLists.txt @@ -122,8 +122,6 @@
@@ -122,8 +122,8 @@ target_link_libraries("gldi"
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gldi.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gldi.pc) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gldi.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gldi.pc)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gldi.pc DESTINATION ${install-pc-path}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gldi.pc DESTINATION ${install-pc-path})
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so DESTINATION ${libdir}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so DESTINATION ${libdir})
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so.${VERSION} DESTINATION ${libdir}) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so.${VERSION} DESTINATION ${libdir})
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so.${SOVERSION} DESTINATION ${libdir}) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so.${SOVERSION} DESTINATION ${libdir})
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so DESTINATION ${libdir})
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so DESTINATION ${libdir})
########### install files ############### ########### install files ###############