Attachment 217445 Details for Bug 248835 – v1

[patch] v1

octopkg.diff (text/plain), 3.83 KB, created by Mikael Urankar on 2020-08-22 15:23:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2020-08-22 15:23:51 UTC

Size: 3.83 KB

patch

obsolete

>Index: ports-mgmt/octopkg/Makefile
>===================================================================
>--- ports-mgmt/octopkg/Makefile	(revision 545760)
>+++ ports-mgmt/octopkg/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	octopkg
>-PORTVERSION=	0.2.0
>-PORTREVISION=	7
>+PORTVERSION=	0.3.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	ports-mgmt
> 
>Index: ports-mgmt/octopkg/distinfo
>===================================================================
>--- ports-mgmt/octopkg/distinfo	(revision 545760)
>+++ ports-mgmt/octopkg/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 91da866a033ce767562b271dade024e607e5561e27475c2a6d23f9792e7d3511
>-SIZE (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 157609
>+TIMESTAMP = 1598109334
>+SHA256 (aarnt-octopkg-v0.3.0_GH0.tar.gz) = 61c258753cce2353b723b1aa7e95bb0f4bcf4fbafaa9df1b976fe5376655084d
>+SIZE (aarnt-octopkg-v0.3.0_GH0.tar.gz) = 294180
>Index: ports-mgmt/octopkg/files/patch-git_5f02bb3e
>===================================================================
>--- ports-mgmt/octopkg/files/patch-git_5f02bb3e	(revision 545760)
>+++ ports-mgmt/octopkg/files/patch-git_5f02bb3e	(nonexistent)
>@@ -1,37 +0,0 @@
>-Sent upstream: https://github.com/aarnt/octopkg/pull/4
>-
>-commit 5f02bb3e504d1d3560ee5a7a3d7c0f90b25adac5
>-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
>-Date:   Thu Jan 21 13:27:57 2016 +0100
>-
>-    QtSolutions: Fix build with Qt 5.5.1.
>-
>-    Import commit ad9bc4600 to the qt-solutions git repository:
>-      QtSingleApplication: Fix build with Qt 5.5 due to the QDataStream
>-      include cleanup.
>-
>-    This fixes the following error:
>-
>-    src/QtSolutions/qtlocalpeer.cpp:159:17: error: variable has incomplete type 'QDataStream'
>-        QDataStream ds(&socket);
>-                    ^
>-    /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
>-    class QDataStream;
>-          ^
>-    src/QtSolutions/qtlocalpeer.cpp:179:17: error: variable has incomplete type 'QDataStream'
>-        QDataStream ds(socket);
>-                    ^
>-    /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
>-    class QDataStream;
>-          ^
>-
>---- src/QtSolutions/qtlocalpeer.cpp
>-+++ src/QtSolutions/qtlocalpeer.cpp
>-@@ -40,6 +40,7 @@
>- 
>- #include "qtlocalpeer.h"
>- #include <QtCore/QCoreApplication>
>-+#include <QtCore/QDataStream>
>- #include <QtCore/QTime>
>- #include <QRegularExpression>
>- 
>
>Property changes on: ports-mgmt/octopkg/files/patch-git_5f02bb3e
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: ports-mgmt/octopkg/files/patch-git_b93ad1a
>===================================================================
>--- ports-mgmt/octopkg/files/patch-git_b93ad1a	(revision 545760)
>+++ ports-mgmt/octopkg/files/patch-git_b93ad1a	(nonexistent)
>@@ -1,17 +0,0 @@
>-Sent upstream: https://github.com/aarnt/octopkg/pull/7
>-
>-From b93ad1a5a1a05717d4e6e7d0d292f9e0a3679987 Mon Sep 17 00:00:00 2001
>-From: "Jason E. Hale" <jhale@FreeBSD.org>
>-Date: Thu, 30 Aug 2018 23:00:37 -0400
>-Subject: [PATCH] Fix build with Qt 5.11
>-
>---- src/transactiondialog.cpp.orig
>-+++ src/transactiondialog.cpp
>-@@ -24,6 +24,7 @@
>- 
>- #include <QMessageBox>
>- #include <QPushButton>
>-+#include <QRegularExpression>
>- #include <QDialog>
>- #include <QCloseEvent>
>- 
>
>Property changes on: ports-mgmt/octopkg/files/patch-git_b93ad1a
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 248835: 217445 | 219236 | 219237