Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (234aebf109b8a70aea730b21f1a70fd189538652)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (234aebf109b8a70aea730b21f1a70fd189538652)
  • Date: Tue, 14 May 2019 12:39:12 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 5 +++++
devel/kdiff3/BUILD | 2 --
devel/kdiff3/DEPENDS | 2 --
devel/kdiff3/DETAILS | 22 ----------------------
devel/kdiff3/HISTORY | 9 ---------
devel/kdiff3/PRE_BUILD | 3 ---
kde.gpg |binary
kde5-apps/kdiff3/CONFIGURE | 1 +
kde5-apps/kdiff3/DEPENDS | 10 ++++++++++
kde5-apps/kdiff3/DETAILS | 25 +++++++++++++++++++++++++
kde5-apps/kdiff3/HISTORY | 7 +++++++
vulkan/vulkan-headers/DETAILS | 4 ++--
vulkan/vulkan-headers/HISTORY | 3 +++
13 files changed, 53 insertions(+), 40 deletions(-)

New commits:
commit 234aebf109b8a70aea730b21f1a70fd189538652
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdiff3-1.8

commit 83525e10c8e86587fa9232d8a1fd4b75ca8b0fde
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kde.gpg - add Michael Reeves

commit d31319bbe589a2251a3012adb13702f04dd718d2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

delete kdiff3

commit 11067c556670e0a67d34aa5644a1e8ea7512761a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

vulkan-headers: => 1.1.108

diff --git a/ChangeLog b/ChangeLog
index 15a8728..280277a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * devel/kdiff3: deleted
+ * kde.gpg: add Michael Reeves <reeves.87 AT gmail.com>
+ * kde5-apps/kdiff3: added, now qt5/kf5 based
+
2019-05-14 Vlad Glagolev <stealth AT sourcemage.org>
* utils/neofetch: command-line system information tool

diff --git a/devel/kdiff3/BUILD b/devel/kdiff3/BUILD
deleted file mode 100755
index 3b3c6e8..0000000
--- a/devel/kdiff3/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ${SOURCE_DIRECTORY}/src-QT4 &&
-qt4_build
diff --git a/devel/kdiff3/DEPENDS b/devel/kdiff3/DEPENDS
deleted file mode 100755
index b6e34ae..0000000
--- a/devel/kdiff3/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends -sub CXX gcc &&
-depends qt4
diff --git a/devel/kdiff3/DETAILS b/devel/kdiff3/DETAILS
deleted file mode 100755
index 3db177c..0000000
--- a/devel/kdiff3/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
- SPELL=kdiff3
- VERSION=0.9.98
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://kdiff3.sourceforge.net";
- LICENSE[0]=GPL
- ENTERED=20150409
- SHORT="a diff and merge program"
-cat << EOF
-KDiff3 is a diff and merge program that
-
- * compares or merges two or three text input files or directories, * shows
- the differences line by line and character by character (!), * provides
- an automatic merge-facility and * an integrated editor for comfortable
- solving of merge-conflicts, * supports Unicode, UTF-8 and other codecs,
- autodetection via byte-order-mark "BOM" * supports KIO on KDE (allows
- accessing ftp, sftp, fish, smb etc.), * Printing of differences, * Manual
- alignment of lines, * Automatic merging of version control history ($Log$),
- * and has an intuitive graphical user interface.
-EOF
diff --git a/devel/kdiff3/HISTORY b/devel/kdiff3/HISTORY
deleted file mode 100644
index 135623d..0000000
--- a/devel/kdiff3/HISTORY
+++ /dev/null
@@ -1,9 +0,0 @@
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DETAILS: remove SOURCEFORGE_URL usage (automated)
-
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: depends -sub CXX gcc (half-automated)
-
-2015-04-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * BUILD, DEPENDS, DETAILS, PRE_BUILD: spell created
-
diff --git a/devel/kdiff3/PRE_BUILD b/devel/kdiff3/PRE_BUILD
deleted file mode 100755
index 3307049..0000000
--- a/devel/kdiff3/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-sedit 's:/usr/local:/usr:' src-QT4/kdiff3.pro
diff --git a/kde.gpg b/kde.gpg
index b80e77c..4083cc5 100644
Binary files a/kde.gpg and b/kde.gpg differ
diff --git a/kde5-apps/kdiff3/CONFIGURE b/kde5-apps/kdiff3/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/kde5-apps/kdiff3/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/kde5-apps/kdiff3/DEPENDS b/kde5-apps/kdiff3/DEPENDS
new file mode 100755
index 0000000..c7f4be5
--- /dev/null
+++ b/kde5-apps/kdiff3/DEPENDS
@@ -0,0 +1,10 @@
+source $GRIMOIRE/KDE5_DEPENDS &&
+depends kconfig &&
+depends kcoreaddons &&
+depends kcrash &&
+depends kdoctools &&
+depends ki18n &&
+depends kiconthemes &&
+depends kio &&
+depends kparts &&
+depends kwidgetsaddons
diff --git a/kde5-apps/kdiff3/DETAILS b/kde5-apps/kdiff3/DETAILS
new file mode 100755
index 0000000..92f513a
--- /dev/null
+++ b/kde5-apps/kdiff3/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=kdiff3
+ VERSION=1.8
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL=https://download.kde.org/stable/$SPELL/$SOURCE
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=https://quickgit.kde.org/?p=..git
+ LICENSE[0]=GPL
+ ENTERED=20180302
+ SHORT="a diff and merge program"
+cat << EOF
+KDiff3 is a diff and merge program that
+
+ * compares or merges two or three text input files or directories, * shows
+ the differences line by line and character by character (!), * provides
+ an automatic merge-facility and * an integrated editor for comfortable
+ solving of merge-conflicts, * supports Unicode, UTF-8 and other codecs,
+ autodetection via byte-order-mark "BOM" * supports KIO on KDE (allows
+ accessing ftp, sftp, fish, smb etc.), * Printing of differences, * Manual
+ alignment of lines, * Automatic merging of version control history ($Log$),
+ * and has an intuitive graphical user interface.
+EOF
diff --git a/kde5-apps/kdiff3/HISTORY b/kde5-apps/kdiff3/HISTORY
new file mode 100644
index 0000000..e29a0b6
--- /dev/null
+++ b/kde5-apps/kdiff3/HISTORY
@@ -0,0 +1,7 @@
+2019-05-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8
+ * DETAILS: add gpg checking
+
+2018-03-92 Treeve Jelbert <treeve AT sourceamge.org>
+ * DETAILS: version master (git)
+ spell created
diff --git a/vulkan/vulkan-headers/DETAILS b/vulkan/vulkan-headers/DETAILS
index 862bc42..c08b585 100755
--- a/vulkan/vulkan-headers/DETAILS
+++ b/vulkan/vulkan-headers/DETAILS
@@ -1,7 +1,7 @@
SPELL=vulkan-headers
SPELLX=Vulkan-Headers
- VERSION=1.1.107
-
SOURCE_HASH=sha512:fb9f2eea0bc8031685adb149f3c5b181bf2cbaa18cc7f22dd84003f78f486fd77726023f3280ee973cd06943ac06cf8309856c69dd4fa3d929ea18b8e2161430
+ VERSION=1.1.108
+
SOURCE_HASH=sha512:e2a96a12e48356c42560bdc10d514df983081f143fa55b40b5bf200909a5b0d7ad340940b4f2aabfb7af3dc77e660b8a1080eec77b481028b987d45bf13f642a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://github.com/KhronosGroup/$SPELLX
diff --git a/vulkan/vulkan-headers/HISTORY b/vulkan/vulkan-headers/HISTORY
index e667efe..8cfbc68 100644
--- a/vulkan/vulkan-headers/HISTORY
+++ b/vulkan/vulkan-headers/HISTORY
@@ -1,3 +1,6 @@
+2019-05-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.108
+
2019-04-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.107




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (234aebf109b8a70aea730b21f1a70fd189538652), Treeve Jelbert, 05/14/2019

Archive powered by MHonArc 2.6.24.

Top of Page