diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-embedded/ponyprog/files | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-embedded/ponyprog/files')
4 files changed, 0 insertions, 243 deletions
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch deleted file mode 100644 index f93da01d646c..000000000000 --- a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://bugs.gentoo.org/227503 - ---- a/v/includex/v/vpsdc.h -+++ b/v/includex/v/vpsdc.h -@@ -14,7 +14,9 @@ - - #include <v/vdc.h> - #include <v/vprinter.h> --#include <fstream.h> -+#include <fstream> -+ -+using namespace std; - - class vPostScriptDC : public vDC - { ---- a/v/includex/v/vpsprntr.h -+++ b/v/includex/v/vpsprntr.h -@@ -14,7 +14,7 @@ - - #include <v/v_defs.h> - #include <v/vmodald.h> --#include <fstream.h> -+#include <fstream> - - #define vPaperLetter 0 - #define vPaperLegal 1 -@@ -31,6 +31,8 @@ - #define vPaperQuarto 12 - #define vPaper10x14 13 - -+using namespace std; -+ - #define vPaperDefault vPaperLetter // Index to default paper - - class vPSPrinter : public vModalDialog ---- a/v/srcx/vpsprntr.cxx -+++ b/v/srcx/vpsprntr.cxx -@@ -103,7 +103,7 @@ static unsigned char prompt_bits[] = { - _height = PaperHeights[_paperType]; - _portrait = 1; - _useColor = 0; -- _pstream = 0; -+ vPSPrinter::_pstream = 0; - - ++_instances; // bump reference counter - } ---- a/rs232int.cpp -+++ b/rs232int.cpp -@@ -145,7 +145,7 @@ int RS232Interface::OpenSerial(int no) - snprintf(lockname, MAXPATH, LOCK_DIR "/LCK..ttyS%d", no); - UserDebug1(UserApp2, "RS232Interface::OpenSerial() now lock the device %s\n", lockname); - -- fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT); -+ fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT,0664); - if (fd < 0) - { - fd = open ((const char *)lockname,O_RDONLY); diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch deleted file mode 100644 index cc29d2f1060e..000000000000 --- a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix parallel make and respect CC, CXX and LDFLAGS - -http://bugs.gentoo.org/282244 -http://bugs.gentoo.org/317767 - ---- Makefile -+++ Makefile -@@ -331,8 +331,8 @@ - - prps: $(PRPS) - --$(PROG): $(OBJS) -- $(CXX) -o $@ $(OBJS) $(LDFLAGS) -+$(PROG): $(OBJS) vlib -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS) - - %.o: %.cpp - $(CXX) $(CFLAGS) -c $< -o $@ ---- v/Config.mk -+++ v/Config.mk -@@ -40,8 +40,6 @@ - #--------------------------------------------------------------------- - #CC = gcc - #CXX = g++ --CC = gcc-3.4 --CXX = g++-3.4 - - #--------------------------------------------------------------------- - # VPATH for dependencies on header files -@@ -302,5 +300,3 @@ - #--------------------------------------------------------------------- - # LINK/LOAD options - #--------------------------------------------------------------------- --LDFLAGS = $(LIBDIR) $(LIBS) -- ---- v/srcx/Makefile -+++ v/srcx/Makefile -@@ -142,7 +142,6 @@ - vprogrsc.h vsliderc.h vtextinc.h vlistc.h vcomboc.h vtextc.h \ - vcolor.h vpen.h vclabelc.h vspinc.h - -- cd iconed ; $(MAKE) ARCH=$@ ; cd .. - - - #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch deleted file mode 100644 index 6883606592fd..000000000000 --- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/desktop/ponyprog.desktop -+++ b/desktop/ponyprog.desktop -@@ -1,12 +1,12 @@ - [Desktop Entry] --Version=3.0.0 -+Version=1.1 - Name=Ponyprog - Comment=EEPROM and microcontroller flasher - GenericName=Ponyprog - TryExec=ponyprog - Exec=ponyprog - Terminal=false --Icon=ponyprog.png -+Icon=ponyprog - Type=Application - Categories=Utility;Qt; - diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch deleted file mode 100644 index c83b62a3a73b..000000000000 --- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,7 @@ - PROJECT(ponyprog) - - # Configure CMake ... --CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) --CMAKE_POLICY(SET CMP0003 OLD) --CMAKE_POLICY(SET CMP0015 OLD) -+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR) - - # set the Qt version to 4 or 5 - OPTION (USE_QT5 "Using of Qt5 version for compiling" ON) -@@ -52,13 +50,7 @@ - OPTION (USE_PROFILER "Include in binary file profiling information" OFF) - - -- --IF(${USE_DEBUGGER}) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall") --ELSE() -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall") --ENDIF() -- -+ADD_COMPILE_OPTIONS("-Wall") - MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}") - - INCLUDE(CheckIncludeFile) -@@ -202,7 +194,6 @@ - SET ( UI_HEADERS_DIR temp ) - SET ( UI_SOURCES_DIR temp ) - --ADD_SUBDIRECTORY(qhexedit2/src) - ADD_SUBDIRECTORY(SrcPony) - - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ ) -@@ -265,6 +256,8 @@ - MESSAGE(STATUS "QT LIBRARIES: ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Core_LIBRARIES}") - ENDIF() - -+TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} qhexedit) -+ - ADD_CUSTOM_TARGET (tags - COMMAND ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ---- a/distribution/posix/CMakeLists.txt -+++ b/distribution/posix/CMakeLists.txt -@@ -5,6 +5,8 @@ - SET(CPACK_INSTALL_PREFIX "/usr") - SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr") - -+INCLUDE(GNUInstallDirs) -+ - MESSAGE("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}") - - # SET( CPACK_PACKAGE_GROUP "${PONYPROG_CPACK_PACKAGE_GROUP}" ) -@@ -12,46 +14,40 @@ - SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" ) - # SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" ) - --INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog" -- DESTINATION "bin/" -- COMPONENT "application" -- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -+INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog" -+ DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ COMPONENT "application" - ) - --INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/" -- DESTINATION "share/icons/" -- COMPONENT "application" -- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/" -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons" -+ COMPONENT "application" - FILES_MATCHING PATTERN "*.png" - ) - --INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/" -- DESTINATION "share/ponyprog/lang/" -- COMPONENT "lang files" -- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/" -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ponyprog/lang" -+ COMPONENT "lang files" - FILES_MATCHING PATTERN "*.utf" -- ) -+ ) - --INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/" -- DESTINATION "share/doc/ponyprog/" -- COMPONENT "help files" -- DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ -+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/" -+ DESTINATION "${CMAKE_INSTALL_DOCDIR}" -+ COMPONENT "help files" - FILES_MATCHING PATTERN "*.jpg" PATTERN "*.html" -- ) -+ ) - --INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright" -- DESTINATION "share/doc/ponyprog/" -- COMPONENT "application" -- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ -- ) -+INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright" -+ DESTINATION "${CMAKE_INSTALL_DOCDIR}" -+ COMPONENT "application" -+ ) - # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}") - - INSTALL(FILES "${PROJECT_SOURCE_DIR}/desktop/ponyprog.desktop" -- DESTINATION "share/applications/" -- COMPONENT "application" -- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/" -+ COMPONENT "application" - ) -- -+ - SET(CPACK_INSTALL_CMAKE_PROJECTS "${PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS}") - - SET(PONYPROG_PACKAGE_DIRECTORY "${CURRENT_BUILD_DIR}") |