Unverified Commit 0dfe7d99 authored by K900's avatar K900 Committed by GitHub
Browse files

presage: drop (#418258)

parents 3f69f953 71e0f443
Loading
Loading
Loading
Loading
+4 −12
Original line number Diff line number Diff line
@@ -26,25 +26,17 @@
  wayland-scanner,
}:

mkDerivation rec {
mkDerivation {
  pname = "maliit-framework";
  version = "2.3.0";
  version = "2.3.0-unstable-2024-06-24";

  src = fetchFromGitHub {
    owner = "maliit";
    repo = "framework";
    tag = version;
    sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY=";
    rev = "ba6f7eda338a913f2c339eada3f0382e04f7dd67";
    hash = "sha256-iwWLnstQMG8F6uE5rKF6t2X43sXQuR/rIho2RN/D9jE=";
  };

  patches = [
    # FIXME: backport GCC 12 build fix, remove for next release
    (fetchpatch {
      url = "https://github.com/maliit/framework/commit/86e55980e3025678882cb9c4c78614f86cdc1f04.diff";
      hash = "sha256-5R+sCI05vJX5epu6hcDSWWzlZ8ns1wKEJ+u8xC6d8Xo=";
    })
  ];

  buildInputs = [
    at-spi2-atk
    at-spi2-core
+4 −6
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@
  libchewing,
  libpinyin,
  maliit-framework,
  presage,
  qtfeedback,
  qtmultimedia,
  qtquickcontrols2,
@@ -19,15 +18,15 @@
  wrapGAppsHook3,
}:

mkDerivation rec {
mkDerivation {
  pname = "maliit-keyboard";
  version = "2.3.1";
  version = "2.3.1-unstable-2024-09-04";

  src = fetchFromGitHub {
    owner = "maliit";
    repo = "keyboard";
    rev = version;
    sha256 = "sha256-XH3sKQuNMLgJi2aV+bnU2cflwkFIw4RYVfxzQiejCT0=";
    rev = "cbb0bbfa67354df76c25dbc3b1ea99a376fd15bb";
    sha256 = "sha256-6ITlV/RJkPDrnsFyeWYWaRTYTaY6NAbHDqpUZGGKyi4=";
  };

  postPatch = ''
@@ -41,7 +40,6 @@ mkDerivation rec {
    libchewing
    libpinyin
    maliit-framework
    presage
    qtfeedback
    qtmultimedia
    qtquickcontrols2
+0 −46
Original line number Diff line number Diff line
From 5624aa156c551ab2b81bb86279844397ed690653 Mon Sep 17 00:00:00 2001
From: Matteo Vescovi <matteo.vescovi@yahoo.co.uk>
Date: Sun, 21 Jan 2018 17:17:12 +0000
Subject: [PATCH] Fixed cppunit detection.

---
 configure.ac | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index a02e9f1..1538a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,10 +204,16 @@ AM_CONDITIONAL([USE_SQLITE], [test "x$use_sqlite" = "xyes"])
 dnl ==================
 dnl Checks for CppUnit
 dnl ==================
-AM_PATH_CPPUNIT([1.9.6],
-                [],
-                [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])])
-AM_CONDITIONAL([HAVE_CPPUNIT], [test "$CPPUNIT_LIBS"])
+PKG_CHECK_MODULES([CPPUNIT],
+                  [cppunit >= 1.9],
+                  [have_cppunit=yes],
+                  [AM_PATH_CPPUNIT([1.9],
+                                   [have_cppunit=yes],
+                                   [AC_MSG_WARN([CppUnit not found. Unit tests will not be built. CppUnit can be obtained from http://cppunit.sourceforge.net.])])
+                  ])
+AC_SUBST([CPPUNIT_CFLAGS])
+AC_SUBST([CPPUNIT_LIBS])
+AM_CONDITIONAL([HAVE_CPPUNIT], [test "x$have_cppunit" = "xyes"])
 
 
 dnl ============================
@@ -592,7 +598,7 @@ then
 else
     build_demo_application="no"
 fi
-if test "$CPPUNIT_LIBS"
+if test "x$have_cppunit" = "xyes"
 then
     build_unit_tests="yes"
 else
-- 
2.31.1
+0 −77
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  fetchurl,
  fetchpatch,
  autoreconfHook,
  dbus,
  doxygen,
  fontconfig,
  gettext,
  graphviz,
  help2man,
  pkg-config,
  sqlite,
  tinyxml,
  cppunit,
}:

stdenv.mkDerivation rec {
  pname = "presage";
  version = "0.9.1";

  src = fetchurl {
    url = "mirror://sourceforge/presage/presage/${version}/presage-${version}.tar.gz";
    sha256 = "0rm3b3zaf6bd7hia0lr1wyvi1rrvxkn7hg05r5r1saj0a3ingmay";
  };

  patches = [
    (fetchpatch {
      name = "gcc6.patch";
      url = "https://git.alpinelinux.org/aports/plain/community/presage/gcc6.patch?id=40e2044c9ecb36eacb3a1fd043f09548d210dc01";
      sha256 = "0243nx1ygggmsly7057vndb4pkjxg9rpay5gyqqrq9jjzjzh63dj";
    })
    ./fixed-cppunit-detection.patch
    # fix gcc11 build
    (fetchpatch {
      name = "presage-0.9.1-gcc11.patch";
      url = "https://build.opensuse.org/public/source/openSUSE:Factory/presage/presage-0.9.1-gcc11.patch?rev=3f8b4b19c99276296d6ea595cc6c431f";
      sha256 = "sha256-pLrIFXvJHRvv4x9gBIfal4Y68lByDE3XE2NZNiAXe9k=";
    })
  ];

  nativeBuildInputs = [
    autoreconfHook
    doxygen
    fontconfig
    gettext
    graphviz
    help2man
    pkg-config
  ];

  preBuild = ''
    export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
  '';

  buildInputs = [
    dbus
    sqlite
    tinyxml
  ];

  nativeCheckInputs = [
    cppunit
  ];

  doCheck = true;

  checkTarget = "check";

  meta = with lib; {
    description = "Intelligent predictive text entry system";
    homepage = "https://presage.sourceforge.io/";
    license = licenses.gpl2Plus;
    maintainers = with maintainers; [ dotlambda ];
  };
}
+1 −0
Original line number Diff line number Diff line
@@ -1561,6 +1561,7 @@ mapAliases {
  ''; # Added 2025-03-07
  poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
  powerdns = pdns; # Added 2022-03-28
  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
  projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10

  cstore_fdw = postgresqlPackages.cstore_fdw;