From f1bc537f089cc8477a9a18db597cb349e1b00e91 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Jun 2018 05:02:38 +0100 Subject: gentoo resync : 16.06.2018 --- media-gfx/cura/files/cura-0.15.04.4-nopower.patch | 90 ---------------------- .../files/cura-2.1.0_beta-fix-install-paths.patch | 38 --------- .../cura/files/cura-2.3.1-fix-install-paths.patch | 38 --------- .../cura/files/cura-3.3.0-fix-install-paths.patch | 37 +++++++++ 4 files changed, 37 insertions(+), 166 deletions(-) delete mode 100644 media-gfx/cura/files/cura-0.15.04.4-nopower.patch delete mode 100644 media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch delete mode 100644 media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch create mode 100644 media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch (limited to 'media-gfx/cura/files') diff --git a/media-gfx/cura/files/cura-0.15.04.4-nopower.patch b/media-gfx/cura/files/cura-0.15.04.4-nopower.patch deleted file mode 100644 index 975d1c507b33..000000000000 --- a/media-gfx/cura/files/cura-0.15.04.4-nopower.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Naur Cura-14.09/Cura/gui/printWindow.py Cura-14.09.new/Cura/gui/printWindow.py ---- Cura-14.09/Cura/gui/printWindow.py 2014-09-19 05:44:21.000000000 -0400 -+++ Cura-14.09.new/Cura/gui/printWindow.py 2014-12-08 16:36:18.410389600 -0500 -@@ -1,7 +1,6 @@ - __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License" - - import wx --import power - import time - import sys - import os -@@ -319,18 +318,6 @@ - self.sizer = wx.GridBagSizer(2, 2) - self.panel.SetSizer(self.sizer) - -- self.powerWarningText = wx.StaticText(parent=self.panel, -- id=-1, -- label=_("Your computer is running on battery power.\nConnect your computer to AC power or your print might not finish."), -- style=wx.ALIGN_CENTER) -- self.powerWarningText.SetBackgroundColour('red') -- self.powerWarningText.SetForegroundColour('white') -- self.powerManagement = power.PowerManagement() -- self.powerWarningTimer = wx.Timer(self) -- self.Bind(wx.EVT_TIMER, self.OnPowerWarningChange, self.powerWarningTimer) -- self.OnPowerWarningChange(None) -- self.powerWarningTimer.Start(10000) -- - self.statsText = wx.StaticText(self.panel, -1, _("InfoLine from printer connection\nInfoLine from dialog\nExtra line\nMore lines for layout\nMore lines for layout\nMore lines for layout")) - - self.connectButton = wx.Button(self.panel, -1, _("Connect")) -@@ -341,7 +328,6 @@ - self.errorLogButton = wx.Button(self.panel, -1, _("Error log")) - self.progress = wx.Gauge(self.panel, -1, range=1000) - -- self.sizer.Add(self.powerWarningText, pos=(0, 0), span=(1, 5), flag=wx.EXPAND|wx.BOTTOM, border=5) - self.sizer.Add(self.statsText, pos=(1, 0), span=(1, 5), flag=wx.LEFT, border=5) - self.sizer.Add(self.connectButton, pos=(2, 0)) - #self.sizer.Add(self.loadButton, pos=(2,1)) -@@ -373,21 +359,6 @@ - self._printerConnection.openActiveConnection() - preventComputerFromSleeping(True) - -- def OnPowerWarningChange(self, e): -- type = self.powerManagement.get_providing_power_source_type() -- if type == power.POWER_TYPE_AC and self.powerWarningText.IsShown(): -- self.powerWarningText.Hide() -- self.panel.Layout() -- self.Layout() -- self.Fit() -- self.Refresh() -- elif type != power.POWER_TYPE_AC and not self.powerWarningText.IsShown(): -- self.powerWarningText.Show() -- self.panel.Layout() -- self.Layout() -- self.Fit() -- self.Refresh() -- - def OnClose(self, e): - if self._printerConnection.hasActiveConnection(): - if self._printerConnection.isPrinting(): -diff -Naur Cura-14.09/scripts/linux/cura.py Cura-14.09.new/scripts/linux/cura.py ---- Cura-14.09/scripts/linux/cura.py 2014-09-19 05:44:21.000000000 -0400 -+++ Cura-14.09.new/scripts/linux/cura.py 2014-12-08 16:37:44.840391177 -0500 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - import os, sys - -@@ -9,7 +9,6 @@ - import wx - import serial - import numpy -- import power - except ImportError as e: - if e.message[0:16] == 'No module named ': - module = e.message[16:] -@@ -20,12 +19,6 @@ - module = 'pyserial' - print 'Requires ' + module - -- if module == 'power': -- print "Install from: https://github.com/GreatFruitOmsk/Power" -- else: -- print "Try sudo easy_install " + module -- print e.message -- - exit(1) - - diff --git a/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch b/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch deleted file mode 100644 index ec07c0014cce..000000000000 --- a/media-gfx/cura/files/cura-2.1.0_beta-fix-install-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2016-04-12 17:39:03.000000000 +0200 -+++ b/CMakeLists.txt 2016-04-16 13:30:27.339900905 +0200 -@@ -55,20 +55,31 @@ - - find_package(PythonInterp 3.4.0 REQUIRED) - -+if(NOT PYTHON_SITE_PACKAGES_DIR) -+ if(APPLE OR WIN32) -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE -+STRING "Directory to install Python bindings to") -+ else() -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages CACHE -+STRING "Directory to install Python bindings to") -+ endif() -+endif() -+ - install(DIRECTORY resources - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - install(DIRECTORY plugins -- DESTINATION lib/cura) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) -+ - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - RENAME cura) - install(DIRECTORY cura -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} - FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) - install(FILES cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES cura.sharedmimeinfo diff --git a/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch b/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch deleted file mode 100644 index 8f503ce73488..000000000000 --- a/media-gfx/cura/files/cura-2.3.1-fix-install-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -urN Cura-2.3.1.orig/CMakeLists.txt Cura-2.3.1/CMakeLists.txt ---- Cura-2.3.1.orig/CMakeLists.txt 2016-11-04 16:24:43.000000000 +0300 -+++ Cura-2.3.1/CMakeLists.txt 2016-12-05 12:20:23.126904644 +0300 -@@ -27,20 +27,31 @@ - - find_package(PythonInterp 3.4.0 REQUIRED) - -+if(NOT PYTHON_SITE_PACKAGES_DIR) -+ if(APPLE OR WIN32) -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages -+ CACHE STRING "Directory to install Python bindings to") -+ else() -+ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ CACHE STRING "Directory to install Python bindings to") -+ endif() -+endif() -+ -+ - install(DIRECTORY resources - DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - install(DIRECTORY plugins -- DESTINATION lib/cura) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) - if(NOT APPLE AND NOT WIN32) - install(FILES cura_app.py - DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - RENAME cura) - install(DIRECTORY cura -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} - FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py -- DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) -+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) - install(FILES ${CMAKE_BINARY_DIR}/cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES cura.sharedmimeinfo diff --git a/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch new file mode 100644 index 000000000000..066f9148c4d9 --- /dev/null +++ b/media-gfx/cura/files/cura-3.3.0-fix-install-paths.patch @@ -0,0 +1,37 @@ +--- Cura-3.1.0-orig/CMakeLists.txt 2017-12-04 18:05:38.000000000 +0200 ++++ Cura-3.1.0/CMakeLists.txt 2017-12-29 18:11:19.508034087 +0200 +@@ -36,10 +36,20 @@ + + find_package(PythonInterp 3.5.0 REQUIRED) + ++if(NOT PYTHON_SITE_PACKAGES_DIR) ++ if(APPLE OR WIN32) ++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages ++ CACHE STRING "Directory to install Python bindings to") ++ else() ++ set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages ++ CACHE STRING "Directory to install Python bindings to") ++ endif() ++endif() ++ + install(DIRECTORY resources + DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) + install(DIRECTORY plugins +- DESTINATION lib${LIB_SUFFIX}/cura) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura) + if(NOT APPLE AND NOT WIN32) + install(FILES cura_app.py + DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -53,10 +63,10 @@ + DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) + else() + install(DIRECTORY cura +- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages ++ DESTINATION ${PYTHON_SITE_PACKAGES_DIR} + FILES_MATCHING PATTERN *.py) + install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py +- DESTINATION lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) ++ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura) + endif() + install(FILES ${CMAKE_BINARY_DIR}/cura.desktop + DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) -- cgit v1.2.3