Merge master into staging-next

    name = "Eric Evenchick";

  };

  evenbrenden = {

    email = "evenbrenden@gmail.com";

    email = "packages@anythingexternal.com";

    github = "evenbrenden";

    githubId = 2512008;

    name = "Even Brenden";

{ lib, buildGoModule, fetchFromGitHub }:

buildGoModule rec {

  pname = "aiac";

  version = "2.2.0";

  excludedPackages = [".ci"];

  src = fetchFromGitHub {

    owner = "gofireflyio";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-Ju2LoCDY4lQaiJ3OSkt01SaOqVLrDGiTAwxxRnbnz/0=";

  };

  vendorHash = "sha256-UaC3Ez/i+kPQGOJYtCRtaD2pn3kVZPTaoCcNG7LiFbY=";

  ldflags = [ "-s" "-w" "-X github.com/gofireflyio/aiac/v3/libaiac.Version=v${version}" ];

  meta = with lib; {

    description = ''Artificial Intelligence Infrastructure-as-Code Generator.'';

    homepage = "https://github.com/gofireflyio/aiac/";

    license = licenses.asl20;

    maintainers = with maintainers; [ qjoly ];

  };

}

{ stdenv

, lib

, fetchFromGitHub

, qtbase

, qttools

, qmake

, qtserialbus

, qtserialport

, qtdeclarative

, wrapQtAppsHook

}:

stdenv.mkDerivation rec {

  pname = "savvycan";

  version = "208";

  src = fetchFromGitHub {

    owner = "collin80";

    repo = "SavvyCAN";

    rev = "V${version}";

    hash = "sha256-agvCl8c7LqGyIKe0K3PdzuBUqTJZtUr434134olbUMw=";

  };

  buildInputs = [ qtbase qttools qtserialbus qtserialport qtdeclarative ];

  nativeBuildInputs = [ qmake wrapQtAppsHook ];

  meta = with lib; {

    description = "QT based cross platform canbus tool";

    homepage = "https://savvycan.com/";

    changelog = "https://github.com/collin80/SavvyCAN/releases/tag/${version}";

    maintainers = with maintainers; [ simoneruffini ];

    platforms = platforms.all;

    license = licenses.mit;

    mainProgram = "SavvyCAN";

    longDescription = ''

      SavvyCAN is a cross platform QT based C++ program. It is a CAN bus reverse

      engineering and capture tool. It was originally written to utilize EVTV

      hardware such as the EVTVDue and CANDue hardware. It has since expanded to be

      able to use any socketCAN compatible device as well as the Macchina M2 and

      Teensy 3.x boards. SavvyCAN can use any CAN interface supported by QT's

      SerialBus system (PeakCAN, Vector, SocketCAN, J2534, etc) It can capture and

      send to multiple buses and CAN capture devices at once. It has many functions

      specifically meant for reverse engineering data found on the CAN bus:

      - Ability to capture even very highly loaded buses

      - Ability to connect to many dongles simultaneously

      - Scan captured traffic for data that looks coherent

      - Show ASCII of captured data to find things like VIN numbers and traffic to

        and from the radio

      - Graph data found on the bus

      - Load and Save many different file formats common to CAN capture tools (Vector

        captures, Microchip, CANDo, PCAN, and many more)

      - Load and Save DBC files. DBC files are used to store definitions for how data

        are formatted on the bus. You can turn the raw data into things like a RPM,

        odometer readings, and more.

      - UDS scanning and decoding

      - Scripting interface to be able to expand the scope of the software

      - Best of all, it's free and open source. Don't like something about it? Change

        it!

    '';

  };

}

stdenv.mkDerivation rec {

  pname = "warp";

  version = "0.5.2";

  version = "0.5.3";

  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "World";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-VtmLWbZXKTv+sjICnaBt2EPbtDwIVZym/PZdL2N7UQo=";

    hash = "sha256-RwsrE4ZIG0i0B7Xu7fDKyDQt4+W2Ntd+epTST8s/YDc=";

  };

  postPatch = ''

  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    name = "${pname}-${version}";

    hash = "sha256-NT6reZUsieqMTX7HW9QmrjcgBpqxZOUfzht9b7suNeY=";

    hash = "sha256-0L7Wz/vOudZ4Bd3umn+auejYGDnSoU6o07+u/MfrgqE=";

  };

  nativeBuildInputs = [

From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001

From: ckie <git-525ff67@ckie.dev>

Date: Tue, 8 Feb 2022 19:18:49 +0200

Subject: [PATCH] remove printer support

---

 app/src/CMakeLists.txt       |  4 ++--

 guilib/src/CMakeLists.txt    |  4 ++--

 guilib/src/GraphViewer.cpp   | 12 +-----------

 guilib/src/ImageView.cpp     | 16 ----------------

 guilib/src/utilite/UPlot.cpp |  9 ---------

 5 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt

index b20a07d4..2cad8c1e 100644

--- a/app/src/CMakeLists.txt

+++ b/app/src/CMakeLists.txt

@@ -63,9 +63,9 @@ ENDIF()

 TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES})

 IF(Qt5_FOUND)

     IF(Qt5Svg_FOUND)

-        QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport)

+        QT5_USE_MODULES(rtabmap Widgets Core Gui Svg)

     ELSE()

-        QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport)

+        QT5_USE_MODULES(rtabmap Widgets Core Gui)

     ENDIF()

 ENDIF(Qt5_FOUND)

diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt

index 3711205b..a393aa25 100644

--- a/guilib/src/CMakeLists.txt

+++ b/guilib/src/CMakeLists.txt

@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES})

 TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES})

 IF(Qt5_FOUND)

     IF(Qt5Svg_FOUND)

-        QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport)

+        QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg)

     ELSE()

-        QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport)

+        QT5_USE_MODULES(rtabmap_gui Widgets Core Gui)

     ENDIF()

 ENDIF(Qt5_FOUND)

diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp

index 58907c34..7b41061f 100644

--- a/guilib/src/GraphViewer.cpp

+++ b/guilib/src/GraphViewer.cpp

@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <QtGui/QDesktopServices>

 #include <QtGui/QContextMenuEvent>

 #include <QColorDialog>

-#include <QPrinter>

 #include <QFileDialog>

 #ifdef QT_SVG_LIB

 #include <QtSvg/QSvgGenerator>

@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event)

 				this->scene()->setSceneRect(this->scene()->itemsBoundingRect());  // Re-shrink the scene to it's bounding contents

 				QSize sceneSize = this->scene()->sceneRect().size().toSize();

-				if(QFileInfo(filePath).suffix().compare("pdf") == 0)

-				{

-					QPrinter printer(QPrinter::HighResolution);

-					printer.setOrientation(QPrinter::Portrait);

-					printer.setOutputFileName( filePath );

-					QPainter p(&printer);

-					scene()->render(&p);

-					p.end();

-				}

-				else if(QFileInfo(filePath).suffix().compare("svg") == 0)

+				if(QFileInfo(filePath).suffix().compare("svg") == 0)

 				{

 #ifdef QT_SVG_LIB

 					QSvgGenerator svgGen;

diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp

index 714f2d36..887e7bdc 100644

--- a/guilib/src/ImageView.cpp

+++ b/guilib/src/ImageView.cpp

@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <QInputDialog>

 #include <QVBoxLayout>

 #include <QColorDialog>

-#include <QPrinter>

 #include <QGraphicsRectItem>

 #include "rtabmap/utilite/ULogger.h"

 #include "rtabmap/gui/KeypointItem.h"

@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e)

 				}

 				_savedFileName = text;

-				if(QFileInfo(text).suffix().compare("pdf") == 0)

-				{

-					QPrinter printer(QPrinter::HighResolution);

-					printer.setOrientation(QPrinter::Portrait);

-					printer.setOutputFileName( text );

-					QPainter p(&printer);

-					p.begin(&printer);

-					double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width());

-					double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height());

-					double scale = qMin(xscale, yscale);

-					p.scale(scale, scale);

-					_graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect());

-					p.end();

-				}

-				else

 				{

 					QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied);

 					QPainter p(&img);

diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp

index 1b11c65e..8bf94841 100644

--- a/guilib/src/utilite/UPlot.cpp

+++ b/guilib/src/utilite/UPlot.cpp

@@ -42,7 +42,6 @@

 #include <QFileDialog>

 #include <QtGui/QClipboard>

 #include <QApplication>

-#include <QPrinter>

 #include <QColorDialog>

 #include <QToolTip>

 #ifdef QT_SVG_LIB

@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event)

 			else

 			{

 #endif

-				if(QFileInfo(text).suffix().compare("pdf") == 0)

-				{

-					QPrinter printer;

-					printer.setOutputFormat(QPrinter::PdfFormat);

-					printer.setOutputFileName(text);

-					this->render(&printer);

-				}

-				else

 				{

 					QPixmap figure = QPixmap::grabWidget(this);

 					figure.save(text);

-- 

2.34.1