Skip to Content.
Sympa Menu

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

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 (5d345ea2b4edf61f15e0de4663b22f63449ebb52)
  • Date: Sun, 4 Feb 2018 11:46:11 +0000

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

database/firebird3/DETAILS | 1
database/firebird3/HISTORY | 6 +++++
database/firebird3/INSTALL | 9 +-------
database/firebird3/patches/0005-fb3client.patch | 25
------------------------
kde5-apps/elisa/DETAILS | 2 -
kde5-apps/elisa/HISTORY | 3 ++
6 files changed, 13 insertions(+), 33 deletions(-)

New commits:
commit 5d345ea2b4edf61f15e0de4663b22f63449ebb52
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird3 - remove specific fb3 naming

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

elisa: => 0.0.81

diff --git a/database/firebird3/DETAILS b/database/firebird3/DETAILS
index 8969fa9..326f144 100755
--- a/database/firebird3/DETAILS
+++ b/database/firebird3/DETAILS
@@ -2,6 +2,7 @@
SPELLX=Firebird
VERSION=3.0.3.32900-0

SOURCE_HASH=sha512:09c4b48745b91973ead9a0be065ebe0ba38db40e4e8a98e29a56c37582e7a7b2bc503c9303af5478bb4c857ce6b7ea07713d769ef7df0543c6c02cffdb630555
+ PATCHLEVEL=1
SECURTIY_PATCH=1
VX=${VERSION%.*}
VX=${VX/./_}
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index 2548a61..e9e2143 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,9 @@
+2018-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * 0005-fb3client.patch: deleted
+ * INSTALL: adjust
+ do not use specif fb3 names
+
2018-02-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.3.32900-0
* patches/*: update
diff --git a/database/firebird3/INSTALL b/database/firebird3/INSTALL
index 4b0ddad..6a8029a 100755
--- a/database/firebird3/INSTALL
+++ b/database/firebird3/INSTALL
@@ -8,11 +8,6 @@ chown firebird:firebird $DEST &&
install_config_file security3.fdb $DEST/security3.fdb &&
chown firebird:firebird $DEST/security3.fdb &&
cp -a *.conf $DEST &&
-#cd $SOURCE_DIRECTORY/builds/install/misc/ &&
-#install_config_file firebird.conf.in $DEST/firebird.conf &&
-#install_config_file databases.conf.in $DEST/databases.conf &&
-#install_config_file fbintl.conf $DEST/fbintl.conf &&
-#install_config_file plugins.conf $DEST/plugins.conf &&
cd $BLD &&
DEST=$INSTALL_ROOT/$FB_PREFIX &&
mkdir -p $DEST &&
@@ -30,9 +25,9 @@ cp -a $SOURCE_DIRECTORY/src/include/firebird/impl $DEST &&
TGT=$TRACK_ROOT/$FB_PREFIX &&
FROM=$INSTALL_ROOT/usr &&
mkdir -p $FROM/lib &&
-ln -vsf $TGT/lib/libfb3client.so $FROM/lib &&
+ln -vsf $TGT/lib/libfbclient.so $FROM/lib &&
mkdir -p $FROM/include &&
-ln -vsf $TGT/include $FROM/include/fb3 &&
+ln -vsf $TGT/include/ibase.h $FROM/include &&

# link to config files
FROM=$INSTALL_ROOT/$FB_PREFIX &&
diff --git a/database/firebird3/patches/0005-fb3client.patch
b/database/firebird3/patches/0005-fb3client.patch
deleted file mode 100644
index 4b7193e..0000000
--- a/database/firebird3/patches/0005-fb3client.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c45f2a703178b5a49057e9404d7d21851545cfac Mon Sep 17 00:00:00 2001
-From: Treeve Jelbert <treeve AT sourcemage.org>
-Date: Sun, 7 Jan 2018 12:05:27 +0100
-Subject: [PATCH 5/6] fb3client
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6bc51de..01fa3e4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -446,7 +446,7 @@ target_link_libraries (yvalve
- add_dependencies_cc (yvalve databases)
- set_exported_symbols (yvalve firebird)
- set_output_directory_unix (yvalve lib)
--set_target_properties (yvalve PROPERTIES OUTPUT_NAME fbclient)
-+set_target_properties (yvalve PROPERTIES OUTPUT_NAME fb3client)
-
-
- ########################################
---
-2.16.0
-
diff --git a/kde5-apps/elisa/DETAILS b/kde5-apps/elisa/DETAILS
index 95ca6a7..0ea1c36 100755
--- a/kde5-apps/elisa/DETAILS
+++ b/kde5-apps/elisa/DETAILS
@@ -1,7 +1,7 @@
SPELL=elisa
VERSION=0.0.81
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_URL=https://download.kde.org/stable/elisa/${VERSION}/$SOURCE
+ SOURCE_URL=https://download.kde.org/unstable/elisa/${VERSION}/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=kde.gpg:$SOURCE.sig:UPSTREAM_KEY
diff --git a/kde5-apps/elisa/HISTORY b/kde5-apps/elisa/HISTORY
index c32cded..66c3897 100644
--- a/kde5-apps/elisa/HISTORY
+++ b/kde5-apps/elisa/HISTORY
@@ -1,3 +1,6 @@
+2018-02-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: fix typo
+
2018-02-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.0.81




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5d345ea2b4edf61f15e0de4663b22f63449ebb52), Treeve Jelbert, 02/04/2018

Archive powered by MHonArc 2.6.24.

Top of Page