View | Details | Raw Unified | Return to bug 248835 | Differences between
and this patch

Collapse All | Expand All

(-)ports-mgmt/octopkg/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	octopkg
4
PORTNAME=	octopkg
5
PORTVERSION=	0.2.0
5
PORTVERSION=	0.3.0
6
PORTREVISION=	7
7
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
8
CATEGORIES=	ports-mgmt
7
CATEGORIES=	ports-mgmt
9
8
(-)ports-mgmt/octopkg/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 91da866a033ce767562b271dade024e607e5561e27475c2a6d23f9792e7d3511
1
TIMESTAMP = 1598109334
2
SIZE (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 157609
2
SHA256 (aarnt-octopkg-v0.3.0_GH0.tar.gz) = 61c258753cce2353b723b1aa7e95bb0f4bcf4fbafaa9df1b976fe5376655084d
3
SIZE (aarnt-octopkg-v0.3.0_GH0.tar.gz) = 294180
(-)ports-mgmt/octopkg/files/patch-git_5f02bb3e (-37 lines)
Lines 1-37 Link Here
1
Sent upstream: https://github.com/aarnt/octopkg/pull/4
2
3
commit 5f02bb3e504d1d3560ee5a7a3d7c0f90b25adac5
4
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
5
Date:   Thu Jan 21 13:27:57 2016 +0100
6
7
    QtSolutions: Fix build with Qt 5.5.1.
8
9
    Import commit ad9bc4600 to the qt-solutions git repository:
10
      QtSingleApplication: Fix build with Qt 5.5 due to the QDataStream
11
      include cleanup.
12
13
    This fixes the following error:
14
15
    src/QtSolutions/qtlocalpeer.cpp:159:17: error: variable has incomplete type 'QDataStream'
16
        QDataStream ds(&socket);
17
                    ^
18
    /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
19
    class QDataStream;
20
          ^
21
    src/QtSolutions/qtlocalpeer.cpp:179:17: error: variable has incomplete type 'QDataStream'
22
        QDataStream ds(socket);
23
                    ^
24
    /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
25
    class QDataStream;
26
          ^
27
28
--- src/QtSolutions/qtlocalpeer.cpp
29
+++ src/QtSolutions/qtlocalpeer.cpp
30
@@ -40,6 +40,7 @@
31
 
32
 #include "qtlocalpeer.h"
33
 #include <QtCore/QCoreApplication>
34
+#include <QtCore/QDataStream>
35
 #include <QtCore/QTime>
36
 #include <QRegularExpression>
37
 
(-)ports-mgmt/octopkg/files/patch-git_b93ad1a (-17 lines)
Lines 1-17 Link Here
1
Sent upstream: https://github.com/aarnt/octopkg/pull/7
2
3
From b93ad1a5a1a05717d4e6e7d0d292f9e0a3679987 Mon Sep 17 00:00:00 2001
4
From: "Jason E. Hale" <jhale@FreeBSD.org>
5
Date: Thu, 30 Aug 2018 23:00:37 -0400
6
Subject: [PATCH] Fix build with Qt 5.11
7
8
--- src/transactiondialog.cpp.orig
9
+++ src/transactiondialog.cpp
10
@@ -24,6 +24,7 @@
11
 
12
 #include <QMessageBox>
13
 #include <QPushButton>
14
+#include <QRegularExpression>
15
 #include <QDialog>
16
 #include <QCloseEvent>
17
 

Return to bug 248835