mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-embedded/ponyprog: drop 3.1.3-r1
Closes: https://bugs.gentoo.org/948619 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST ponyprog-3.1.3.tar.gz 11479313 BLAKE2B 56704b28877687c356c72b1f28f28115cb11f40c701e207f5d3ec4aa4fa7194991162f0940400016d9ee5d42ff0a7e7da5b252f9b76417d0d8272638989fedec SHA512 09e702f3f98e65799e8c59b9c8eca6f477db3f36a2648a1fab3797f91d56c7c4e9533e32bef1fe4c641512e31828a39df4d3d83639b7541714a3cc9050cd4e67
|
||||
DIST ponyprog-3.1.4_p20250501.tar.gz 11832067 BLAKE2B 78de11392f3790e8e7c34b1be3bd76a3a6a11606dcfc07ecd1e5acb405e03a7b06029fea11c20d699b8ef26e8670e3abfd300053c833e5d87dfd7354b04f7a1a SHA512 9c489559960188a2ddae57eb2ca55bfc4e0411cf3837ae84b92d9b2b6c419d5eeaece5d2b6acab73befd3401ee965c4da3bc52510c7145d1379dd2be6b62d408
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 99e6ff1..d80dcc8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
PROJECT(ponyprog)
|
||||
|
||||
# Configure CMake ...
|
||||
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
|
||||
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
|
||||
# CMAKE_POLICY(SET CMP0003 OLD)
|
||||
# CMAKE_POLICY(SET CMP0015 OLD)
|
||||
|
||||
@@ -46,14 +46,7 @@ OPTION (USE_DEBUGGER "Include in binary file debug information" OFF)
|
||||
OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
|
||||
|
||||
|
||||
-IF(${USE_DEBUGGER})
|
||||
- SET(CMAKE_BUILD_TYPE Debug)
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
|
||||
-ELSE()
|
||||
- SET(CMAKE_BUILD_TYPE Release)
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
|
||||
-ENDIF()
|
||||
-
|
||||
+ADD_COMPILE_OPTIONS("-Wall")
|
||||
MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
|
||||
|
||||
INCLUDE(CheckIncludeFile)
|
||||
@@ -239,11 +232,12 @@ SET ( MOC_DIR temp )
|
||||
SET ( UI_HEADERS_DIR temp )
|
||||
SET ( UI_SOURCES_DIR temp )
|
||||
|
||||
-ADD_SUBDIRECTORY(qhexedit2/src)
|
||||
ADD_SUBDIRECTORY(SrcPony)
|
||||
|
||||
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
|
||||
+find_library(QHexEdit_LIBRARY NAMES qhexedit)
|
||||
+set(QHexEdit_LIBRARIES "${QHexEdit_LIBRARY}")
|
||||
|
||||
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
|
||||
|
||||
IF(${USE_QT_VERSION} MATCHES "4")
|
||||
# QT4_ADD_TRANSLATION(APP_TRANSLATIONS ${TRANSLATION})
|
||||
@@ -312,7 +306,7 @@ ELSE()
|
||||
ENDIF()
|
||||
|
||||
#TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDI_LIBRARIES} )
|
||||
-TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDIPP_LIBRARY} ${LIBFTDI_LIBRARY} ${LIBUSB_LIBRARIES})
|
||||
+TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${LIBFTDIPP_LIBRARY} ${LIBFTDI_LIBRARY} ${LIBUSB_LIBRARIES} ${QHexEdit_LIBRARIES})
|
||||
|
||||
ADD_CUSTOM_TARGET (tags
|
||||
COMMAND ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony
|
||||
diff --git a/SrcPony/e2cmdw.cpp b/SrcPony/e2cmdw.cpp
|
||||
index 252c730..cec93cc 100644
|
||||
--- a/SrcPony/e2cmdw.cpp
|
||||
+++ b/SrcPony/e2cmdw.cpp
|
||||
@@ -44,7 +44,7 @@
|
||||
#include <QMessageBox>
|
||||
#include <QDesktopServices>
|
||||
|
||||
-#include "qhexedit.h"
|
||||
+#include <qhexedit.h>
|
||||
|
||||
#include "version.h"
|
||||
#include "e2profil.h"
|
||||
diff --git a/SrcPony/e2cmdw.h b/SrcPony/e2cmdw.h
|
||||
index c349bf3..df47206 100644
|
||||
--- a/SrcPony/e2cmdw.h
|
||||
+++ b/SrcPony/e2cmdw.h
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
|
||||
#include "ui_mainwindow.h"
|
||||
-#include "qhexedit.h"
|
||||
+#include <qhexedit.h>
|
||||
|
||||
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake flag-o-matic udev
|
||||
|
||||
DESCRIPTION="EEPROM and microcontroller programmer/flasher"
|
||||
HOMEPAGE="https://github.com/lancos/ponyprog/"
|
||||
SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="
|
||||
<app-editors/qhexedit2-0.8.10
|
||||
dev-embedded/libftdi:1[cxx]
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtmultimedia:5
|
||||
dev-qt/qtprintsupport:5
|
||||
dev-qt/qtwidgets:5
|
||||
virtual/libusb:1
|
||||
"
|
||||
# blocker on libftdi-1.5-r2: see #775116
|
||||
RDEPEND="${DEPEND}
|
||||
!=dev-embedded/libftdi-1.5-r2
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
|
||||
|
||||
src_configure() {
|
||||
# -Werror=odr
|
||||
# https://bugs.gentoo.org/855272
|
||||
# https://github.com/lancos/ponyprog/issues/28
|
||||
filter-lto
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
|
||||
elog "To use the COM port in user mode (not as root), you need to"
|
||||
elog "be in the 'uucp' group."
|
||||
elog
|
||||
elog "To use the LPT port in user mode (not as root) you need a kernel with"
|
||||
elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
|
||||
elog "rights to write to /dev/parport? devices."
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
Reference in New Issue
Block a user