Skip to content

Commit

Permalink
[graphics/py-qt-gepetto-viewer-corba] Update to v6.0.0
Browse files Browse the repository at this point in the history
Changes in v6.0.0:
- no changes

Packaging changes:
- update patch-aa
  • Loading branch information
nim65s committed Dec 17, 2024
1 parent 9f948a1 commit ca11de8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
2 changes: 0 additions & 2 deletions graphics/py-qt-gepetto-viewer-corba/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
# Created: Florent Lamiraux on Sun, 8 Mar 2015
#

PKGREVISION= 1
HPP_PACKAGE= gepetto-viewer-corba
HPP_COMMENT= Corba server for gepetto-viewer
HPP_VERSION= 5.8.1
HPP_NAMESPACE= gepetto

PKGNAME= ${PKGTAG.python-}${PKGTAG.qt-}${DISTNAME}
Expand Down
8 changes: 4 additions & 4 deletions graphics/py-qt-gepetto-viewer-corba/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SHA1 (gepetto-viewer-corba-5.8.1.tar.gz) = 9dce0f8caf6a4e447aed808ec4dc9ee48a0ea585
RMD160 (gepetto-viewer-corba-5.8.1.tar.gz) = ca583285d3702d01e1eb8f35d4b6f1b11c1f7c82
Size (gepetto-viewer-corba-5.8.1.tar.gz) = 908930 bytes
SHA1 (patch-aa) = 8178b68b4c135e375368b21c72c4a38d8f99bd05
SHA1 (gepetto-viewer-corba-6.0.0.tar.gz) = 9df8db8552e343dc462f39b929fce58157d5f19b
RMD160 (gepetto-viewer-corba-6.0.0.tar.gz) = 793cb191c85dd050034e18756991c099771144be
Size (gepetto-viewer-corba-6.0.0.tar.gz) = 908723 bytes
SHA1 (patch-aa) = d86525647d0736a91e97892c852823ed41fbcdc2
14 changes: 6 additions & 8 deletions graphics/py-qt-gepetto-viewer-corba/patches/patch-aa
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ so this is not robust anyway.

Still append <prefix>_LDFLAGS_OTHER to LINK_FLAGS, as this may contain e.g. a
required linker rpath.

--- cmake/pkg-config.cmake~ 2024-10-08 00:19:41.000000000 +0200
+++ cmake/pkg-config.cmake 2024-11-08 17:14:01.580195312 +0100
@@ -992,13 +992,12 @@
--- cmake/pkg-config.cmake.orig 2024-11-20 21:03:18.000000000 +0100
+++ cmake/pkg-config.cmake 2024-12-17 17:40:20.236117765 +0100
@@ -1097,13 +1097,12 @@
endif()

# Transform semi-colon seperated list in to space separated list.
Expand All @@ -23,9 +22,9 @@ required linker rpath.
set_target_properties(${TARGET} PROPERTIES LINK_FLAGS${CONFIG} "${LDFLAGS}")
- _filter_link_flags(${TARGET} ${IS_GENERAL} ${IS_DEBUG} "${${PREFIX}_LDFLAGS}")
_filter_link_flags(${TARGET} ${IS_GENERAL} ${IS_DEBUG}
"${${PREFIX}_LDFLAGS_OTHER}")
endmacro(
@@ -1046,12 +1046,7 @@
"${${PREFIX}_LDFLAGS_OTHER}"
)
@@ -1155,11 +1154,7 @@
endif()
endif()

Expand All @@ -34,7 +33,6 @@ required linker rpath.
- if(DEFINED ${PREFIX}_DEBUG_FOUND)
- link_directories(${${PREFIX}_DEBUG_LIBRARY_DIRS})
- endif()
-
+ target_link_libraries(${TARGET} ${PUBLIC_KEYWORD} ${${PREFIX}_LINK_LIBRARIES})
endmacro(PKG_CONFIG_USE_LLINK_DEPENDENCY)

Expand Down

0 comments on commit ca11de8

Please sign in to comment.