From 8dda1ec8ee78333e99d6de438c64c2fffef344a2 Mon Sep 17 00:00:00 2001
From: bgme <i@bgme.me>
Date: Mon, 15 May 2023 22:13:09 +0800
Subject: [PATCH] fix rstudio-desktop

---
 repo/rstudio-desktop/lilac.yaml |  4 ++-
 repo/soci-git/lilac.yaml        | 18 +++++++++++++
 repo/soci/PKGBUILD              | 47 ---------------------------------
 repo/soci/lilac.yaml            | 13 ---------
 4 files changed, 21 insertions(+), 61 deletions(-)
 create mode 100644 repo/soci-git/lilac.yaml
 delete mode 100644 repo/soci/PKGBUILD
 delete mode 100644 repo/soci/lilac.yaml

diff --git a/repo/rstudio-desktop/lilac.yaml b/repo/rstudio-desktop/lilac.yaml
index d12afb0..05a1480 100644
--- a/repo/rstudio-desktop/lilac.yaml
+++ b/repo/rstudio-desktop/lilac.yaml
@@ -3,7 +3,9 @@ maintainers:
     email: i@bgme.me
 
 repo_depends:
-  - soci
+  - soci-git
+update_on_build:
+  - pkgbase: soci-git
 
 build_prefix: extra-x86_64
 
diff --git a/repo/soci-git/lilac.yaml b/repo/soci-git/lilac.yaml
new file mode 100644
index 0000000..c2263bb
--- /dev/null
+++ b/repo/soci-git/lilac.yaml
@@ -0,0 +1,18 @@
+maintainers:
+  - github: yingziwu
+    email: i@bgme.me
+
+build_prefix: extra-x86_64
+
+pre_build_script: |
+  aur_pre_build()
+  add_makedepends(['git'])
+
+post_build: aur_post_build
+
+update_on:
+  - source: aur
+    aur: soci-git
+  - source: github
+    github: SOCI/soci
+    branch: release/4.0
diff --git a/repo/soci/PKGBUILD b/repo/soci/PKGBUILD
deleted file mode 100644
index 529a0fd..0000000
--- a/repo/soci/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
-# Contributor: Daniel Nagy <danielnagy at gmx de>
-# Contributor: Mika Fischer <mika.fischer@zoopnet.de>
-
-pkgname=soci
-pkgver=4.0.3
-pkgrel=1
-pkgdesc="Database access library for C++"
-arch=('i686' 'x86_64')
-url="http://soci.sf.net"
-license=('custom:boost')
-depends=('gcc-libs')
-makedepends=('cmake' 'postgresql-libs' 'sqlite3' 'unixodbc' 'boost')
-optdepends=('oracle-instantclient-basic: support for oracle databases'
-            'libmysqlclient: support for mysql databases'
-            'postgresql-libs: support for postgresql databases'
-            'sqlite3: support for sqlite databases'
-            'unixodbc: support for ODBC databases'
-            'libmysqlclient'
-            'boost-libs')
-options=('staticlibs')
-source=("http://downloads.sourceforge.net/project/soci/soci/${pkgname}-${pkgver}/${pkgname}-${pkgver}.zip")
-sha1sums=('e76d5862f90cfa8a0f9fe6ce477c3c7fa669af62')
-
-build() {
-    rm -rf "${srcdir}/${pkgname}-${pkgver}-build"
-    mkdir -p "${srcdir}/${pkgname}-${pkgver}-build"
-    cd "${srcdir}/${pkgname}-${pkgver}-build"
-    cmake \
-        -DSOCI_TESTS=OFF \
-        -DCMAKE_INSTALL_PREFIX="/usr" \
-        -DCMAKE_CXX_STANDARD=11       \
-        "${srcdir}/${pkgname}-${pkgver}"
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}-build"
-    make DESTDIR="${pkgdir}" install
-
-    # For some reason -DLIBDIR=lib causes libsoci_empty.so to disappear
-    if [ -e "${pkgdir}/usr/lib64" ]; then
-        mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
-    fi
-    install -Dm0644 "${srcdir}/${pkgname}-${pkgver}/LICENSE_1_0.txt" \
-        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/repo/soci/lilac.yaml b/repo/soci/lilac.yaml
deleted file mode 100644
index 72b55fe..0000000
--- a/repo/soci/lilac.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-maintainers:
-  - github: yingziwu
-    email: i@bgme.me
-
-build_prefix: extra-x86_64
-
-pre_build: aur_pre_build
-
-post_build: aur_post_build
-
-update_on:
-  - source: aur
-    aur: soci