Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gede for openSUSE:Factory checked in at 2024-12-02 16:59:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gede (Old) and /work/SRC/openSUSE:Factory/.gede.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gede" Mon Dec 2 16:59:02 2024 rev:8 rq:1227636 version:2.21.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gede/gede.changes 2024-11-25 23:22:55.142221759 +0100 +++ /work/SRC/openSUSE:Factory/.gede.new.28523/gede.changes 2024-12-02 16:59:22.405803023 +0100 @@ -1,0 +2,6 @@ +Sun Dec 1 20:41:03 UTC 2024 - Bruno Pitrus <[email protected]> + +- New upstream version 2.21.1 + * Add Qt6 port + +------------------------------------------------------------------- Old: ---- v2.20.2.tar.gz New: ---- _multibuild v2.21.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gede.spec ++++++ --- /var/tmp/diff_new_pack.tROepS/_old 2024-12-02 16:59:24.517891641 +0100 +++ /var/tmp/diff_new_pack.tROepS/_new 2024-12-02 16:59:24.537892480 +0100 @@ -16,45 +16,65 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +Version: 2.21.1 +Release: 0 +%if "@BUILD_FLAVOR@" == "qt6" +Name: gede-qt6 +%global QTVER 6 +Provides: gede = %version +Conflicts: gede +%else Name: gede -Version: 2.20.2 -Release: 0 -Summary: Qt-based GUI to GDB +%global QTVER 5 +%endif +Summary: Qt{%QTVER}-based GUI to GDB License: BSD-2-Clause Group: Development/Tools/Debuggers URL: https://gede.dexar.se Source0: https://github.com/jhn98032/gede/archive/refs/tags/v%{version}.tar.gz Source1: gede.desktop -BuildRequires: libQt5SerialPort-devel -BuildRequires: libQt5Widgets-devel +BuildRequires: pkgconfig(Qt%{QTVER}SerialPort) +BuildRequires: pkgconfig(Qt%{QTVER}Widgets) +%if "@BUILD_FLAVOR@" == "qt6" +BuildRequires: qt6-macros +%else BuildRequires: libqt5-qtbase-common-devel +%endif Requires: /usr/bin/ctags Recommends: gdb %description Gede is a graphical frontend (GUI) to GDB written in C++ and using the Qt5 toolkit. Gede supports debugging programs written in Ada, FreeBasic, C++, C, Rust, Fortran and Go. - %prep -%setup -q +%setup -q -n gede-%{version} %build cd src +%if "@BUILD_FLAVOR@" == "qt6" +%qmake6 +%else %qmake5 +%endif #Qmake adds this relocation model which is not needed for the main binary and produces worse code sed -i 's/ -fPIC / /g' Makefile %make_jobs %install -install -pvDm755 %{_builddir}/%{name}-%{version}/src/gede -t %{buildroot}%{_bindir} +install -pvDm755 src/gede -t %{buildroot}%{_bindir} +install -pvDm644 AppDir/gede_icon.png -t %{buildroot}%{_datadir}/pixmaps install -pvDm644 %{_sourcedir}/gede.desktop -t %{buildroot}%{_datadir}/applications %check #The other programs in tests/ are samples/debug tools for the embedded highlighter library, not test suites. cd tests/ini +%if "@BUILD_FLAVOR@" == "qt6" +%qmake6 +%else %qmake5 +%endif sed -i 's/ -fPIC / /g' Makefile %make_jobs ./test_ini @@ -66,6 +86,7 @@ %files %{_bindir}/gede %{_datadir}/applications/gede.desktop +%{_datadir}/pixmaps/gede_icon.png %license LICENSE %doc README.rst ++++++ _multibuild ++++++ <multibuild> <package>qt6</package> </multibuild> (No newline at EOF) ++++++ gede.desktop ++++++ --- /var/tmp/diff_new_pack.tROepS/_old 2024-12-02 16:59:24.933909096 +0100 +++ /var/tmp/diff_new_pack.tROepS/_new 2024-12-02 16:59:24.973910774 +0100 @@ -3,6 +3,7 @@ GenericName=Debugger Comment=Frontend for GNU Debugger (gdb) Exec=gede +Icon=gede_icon Terminal=false Type=Application Categories=Development;Debugger;Qt ++++++ v2.20.2.tar.gz -> v2.21.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/.github/workflows/appimage.yml new/gede-2.21.1/.github/workflows/appimage.yml --- old/gede-2.20.2/.github/workflows/appimage.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/gede-2.21.1/.github/workflows/appimage.yml 2024-12-01 09:41:54.000000000 +0100 @@ -0,0 +1,103 @@ +name: Create appimage + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + + # Checkout the repository + - name: Checkout code + uses: actions/checkout@v4 + + # Install dependencies + - name: Install build tools + run: | + sudo apt-get update + sudo apt-get install -y build-essential wget libfuse2 + + # Set up Qt + - name: Install Qt + run: | + sudo apt-get update + sudo apt-get install -y qt5-qmake qtbase5-dev libqt5serialport5-dev + + # Install ctags + - name: Install ctags + run: | + sudo apt-get install -y exuberant-ctags + + + # Download appimagetool + - name: Download appimagetool + run: | + wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage + chmod +x appimagetool-x86_64.AppImage + + # Build the project + - name: Build project + run: | + ./build.py --prefix=$(pwd)/AppDir install + + # Prepare AppDir + - name: Prepare AppDir + run: | + mkdir -p AppDir/ + chmod +x AppDir/bin/gede + + # Build AppImage + - name: Build AppImage + run: | + ./appimagetool-x86_64.AppImage AppDir + + # Upload AppImage as an artifact + - name: Upload AppImage + uses: actions/upload-artifact@v4 + with: + # Optional. Default is 'artifact' + #name: Gede-${{ github.ref_name }}.AppImage + name: Gede-x86_64.AppImage + # A file, directory or wildcard pattern that describes what to upload + path: Gede-x86_64.AppImage + + # The desired behavior if no files are found using the provided path. + # Available Options: + # warn: Output a warning but do not fail the action + # error: Fail the action with an error message + # ignore: Do not output any warnings or errors, the action does not fail + # Optional. Default is 'warn' + #if-no-files-found: + + # Duration after which artifact will expire in days. 0 means using default retention. + # Minimum 1 day. + # Maximum 90 days unless changed from the repository settings page. + # Optional. Defaults to repository settings. + #retention-days: + + # The level of compression for Zlib to be applied to the artifact archive. + # The value can range from 0 to 9. + # For large files that are not easily compressed, a value of 0 is recommended for significantly faster uploads. + # Optional. Default is '6' + #compression-level: + + # If true, an artifact with a matching name will be deleted before a new one is uploaded. + # If false, the action will fail if an artifact for the given name already exists. + # Does not fail if the artifact does not exist. + # Optional. Default is 'false' + #overwrite: + + # Whether to include hidden files in the provided path in the artifact + # The file contents of any hidden files in the path should be validated before + # enabled this to avoid uploading sensitive information. + # Optional. Default is 'false' + #include-hidden-files: + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/.github/workflows/build.yml new/gede-2.21.1/.github/workflows/build.yml --- old/gede-2.20.2/.github/workflows/build.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/gede-2.21.1/.github/workflows/build.yml 2024-12-01 09:41:54.000000000 +0100 @@ -0,0 +1,32 @@ +name: Build + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + # Set up Qt + - name: Install Qt + run: | + sudo apt-get update + sudo apt-get install -y qt5-qmake qtbase5-dev libqt5serialport5-dev + + # Install ctags + - name: Install ctags + run: | + sudo apt-get install -y exuberant-ctags + + # Build the project + - name: Build project + run: | + make + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/.github/workflows/release.yml new/gede-2.21.1/.github/workflows/release.yml --- old/gede-2.20.2/.github/workflows/release.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/gede-2.21.1/.github/workflows/release.yml 2024-12-01 09:41:54.000000000 +0100 @@ -0,0 +1,74 @@ +name: Auto release + +on: + push: + tags: + - 't*' # Trigger the workflow when a tag like v1.0.0 is pushed + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + + # Checkout the repository + - name: Checkout code + uses: actions/checkout@v4 + + # Install dependencies + - name: Install build tools + run: | + sudo apt-get update + sudo apt-get install -y build-essential wget libfuse2 + + # Set up Qt + - name: Install Qt + run: | + sudo apt-get update + sudo apt-get install -y qt5-qmake qtbase5-dev libqt5serialport5-dev + + # Install ctags + - name: Install ctags + run: | + sudo apt-get install -y exuberant-ctags + + + # Download appimagetool + - name: Download appimagetool + run: | + wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage + chmod +x appimagetool-x86_64.AppImage + + # Build the project + - name: Build project + run: | + ./build.py --prefix=$(pwd)/AppDir install + + # Prepare AppDir + - name: Prepare AppDir + run: | + mkdir -p AppDir/ + cp gede_icon.png AppDir/ + cp gede.desktop AppDir/ + chmod +x AppDir/bin/gede + + # Build AppImage + - name: Build AppImage + run: | + ./appimagetool-x86_64.AppImage AppDir + + + # Create a release and upload the artifact + - name: Create GitHub Release + uses: ncipollo/release-action@v1 + with: + tag: ${{ github.ref_name }} # The tag that triggered the workflow + name: Release ${{ github.ref_name }} # Name of the release + body: | + ### Changelog + - + artifacts: Gede-x86_64.AppImage + token: ${{ secrets.GITHUB_TOKEN }} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/AppDir/AppRun new/gede-2.21.1/AppDir/AppRun --- old/gede-2.20.2/AppDir/AppRun 1970-01-01 01:00:00.000000000 +0100 +++ new/gede-2.21.1/AppDir/AppRun 2024-12-01 09:41:54.000000000 +0100 @@ -0,0 +1,4 @@ +#!/bin/sh +APPDIR="$(dirname "$(readlink -f "$0")")" +exec "$APPDIR/bin/gede" "$@" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/AppDir/gede.desktop new/gede-2.21.1/AppDir/gede.desktop --- old/gede-2.20.2/AppDir/gede.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/gede-2.21.1/AppDir/gede.desktop 2024-12-01 09:41:54.000000000 +0100 @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Gede +Icon=gede_icon +Type=Application +Categories=Utility;Development; + Binary files old/gede-2.20.2/AppDir/gede_icon.png and new/gede-2.21.1/AppDir/gede_icon.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/README.rst new/gede-2.21.1/README.rst --- old/gede-2.20.2/README.rst 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/README.rst 2024-12-01 09:41:54.000000000 +0100 @@ -1,12 +1,23 @@ Gede ---- +Gede is a graphical frontend (GUI) to GDB written in C++ and using the Qt5 toolkit. +Gede can be compiled and run on (all?) Linux distributions, FreeBSD and macOS. +Gede supports debugging programs written in Ada, FreeBasic, C++, C, Rust, Fortran and Go. + +.. image:: https://gede.dexar.se/uploads/Main/screenshot_1.13.1_a.png + :alt: Screenshot + :width: 300px + :align: left + Gede was written by Johan Henriksson. See LICENSE file for license information. The icons used are from the NetBeans project and licensed under the terms of the NetBeans License Agreement. +For more information see https://gede.dexar.se. + Dependencies ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/build.py new/gede-2.21.1/build.py --- old/gede-2.20.2/build.py 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/build.py 2024-12-01 09:41:54.000000000 +0100 @@ -11,7 +11,8 @@ FORCE_QT4=1 FORCE_QT5=2 -AUTODETECT=3 +FORCE_QT6=3 +AUTODETECT=4 #-----------------------------# # Configuration section @@ -22,6 +23,7 @@ g_qtVersionToUse = FORCE_QT5 g_qmakeQt4 = "" g_qmakeQt5 = "" +g_qmakeQt6 = "" g_otherSrcDirs = [ "./tests/tagtest", "./tests/highlightertest", @@ -117,6 +119,7 @@ print(" --verbose Verbose output.") print(" --use-qt4 Use qt4") print(" --use-qt5 Use qt5") + print(" --use-qt6 Use qt6") print(" --build-all Build test programs also") print(" --parallel-builds=NUM Number of parallel jobs to run in parallel") print("") @@ -159,7 +162,7 @@ verStr = out.strip() print(verStr) except Exception as e: - print("Error occured: " + str(e)) + print("Error occured when started qmake: " + str(e)) raise return verStr @@ -169,6 +172,7 @@ """ global g_qmakeQt4 global g_qmakeQt5 + global g_qmakeQt6 sys.stdout.write("Detecting Qt version... ") qtVerList = [] if exeExist("qmake-qt4"): @@ -177,9 +181,15 @@ if exeExist("qmake-qt5"): qtVerList += ["Qt5 (qmake-qt5)"] g_qmakeQt5 = "qmake-qt5"; + if exeExist("qmake6"): + qtVerList += ["Qt6 (qmake6)"] + g_qmakeQt6 = "qmake6"; if exeExist("qmake"): ver = detectQmakeQtVer("qmake")[0] - if ver == "5": + if ver == "6": + g_qmakeQt6 = "qmake"; + qtVerList += ["Qt6 (qmake)"] + elif ver == "5": g_qmakeQt5 = "qmake"; qtVerList += ["Qt5 (qmake)"] elif ver == "4": @@ -189,7 +199,7 @@ g_qmakeQt5 = "qmake"; qtVerList += ["Qt? (qmake)"] sys.stdout.write(", ".join(qtVerList) + "\n") - if (not g_qmakeQt4) and (not g_qmakeQt5): + if (not g_qmakeQt4) and (not g_qmakeQt5) and (not g_qmakeQt6): print("No Qt found"); # Which version to use? @@ -202,6 +212,12 @@ os.environ["QT_SELECT"] = "qt5" if g_qmakeQt5: qmakeName = g_qmakeQt5; + elif g_qtVersionToUse == FORCE_QT6: + os.environ["QT_SELECT"] = "qt6" + if g_qmakeQt6: + qmakeName = g_qmakeQt6; + elif g_qmakeQt6: + qmakeName = g_qmakeQt6; elif g_qmakeQt5: qmakeName = g_qmakeQt5; elif g_qmakeQt4: @@ -243,6 +259,8 @@ g_qtVersionToUse = FORCE_QT4 elif arg == "--use-qt5": g_qtVersionToUse = FORCE_QT5 + elif arg == "--use-qt6": + g_qtVersionToUse = FORCE_QT6 elif arg.startswith("--parallel-builds="): g_parallel_builds = int(arg[18:]) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/create_release.py new/gede-2.21.1/create_release.py --- old/gede-2.20.2/create_release.py 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/create_release.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -#!/usr/bin/env python3 -# -# Written by Johan Henriksson. Copyright (C) 2014-2021. -# -import sys -import os -import subprocess - - -if len(sys.argv) < 2: - print("Usage: ./create_release.py VERSION") - print("Available versions:") - p = subprocess.Popen(['git', 'tag'], stdout=subprocess.PIPE, text=True) - out, err = p.communicate() - errcode = p.returncode - for line in out.split('\n'): - if line.find("rel-") == 0: - print(" %s" % (line[4:])) - exit(1) - -# Parse arguments -version = sys.argv[1] - -filename = "gede-%s.tar" % (version) - -if os.path.exists(filename): - os.remove(filename) -if os.path.exists(filename + ".xz"): - os.remove(filename + ".xz") - -os.system("git archive --format tar --prefix=gede-%s/ --output %s rel-%s" % (version, filename, version)) - -# Remove some files from the archive -os.system("tar --delete -f %s 'gede-%s/create_release.py'" % (filename, version)) -os.system("tar --delete -f %s 'gede-%s/tagit.py'" % (filename, version)) -os.system("tar --delete -f %s --wildcards 'gede-%s/relop_*'" % (filename, version)) -os.system("tar --delete -f %s 'gede-%s/.gitignore'" % (filename, version)) -os.system("tar --delete -f %s 'gede-%s/startpage'" % (filename, version)) -os.system("tar --delete -f %s 'gede-%s/doc'" % (filename, version)) - - - -os.system("xz -9 %s" % (filename)) -print("%s.xz created" % (filename)) - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/consolewidget.cpp new/gede-2.21.1/src/consolewidget.cpp --- old/gede-2.20.2/src/consolewidget.cpp 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/consolewidget.cpp 2024-12-01 09:41:54.000000000 +0100 @@ -22,8 +22,8 @@ #include "core.h" -#define ASCII_ESC 0x1B -#define ASCII_BELL 0x7 +#define ASCII_ESC ((char)0x1B) +#define ASCII_BELL ((char)0x7) #define ASCII_BACKSPACE '\b' #define ANSI_CSI "\033[" @@ -80,7 +80,7 @@ for(int i = 0;i < str.size();i++) { QChar c = str[i]; - if(0x21 <= c && c <= 0x7e) + if(0x21 <= c.toLatin1() && c.toLatin1() <= 0x7e) line += c; else if(c == '\t') line += "\\t"; @@ -92,7 +92,7 @@ line += "\\b"; else if(c == ' ') line += " "; - else if(c == ASCII_ESC) + else if(c.toLatin1() == ASCII_ESC) line += "<ESC>"; else { @@ -704,7 +704,7 @@ };break; case ST_CSI_PARAM: { - if(0x30 <= c && c <= 0x3F) + if(0x30 <= (int)c.toLatin1() && (int)c.toLatin1() <= 0x3F) { m_ansiParamStr += c; } @@ -716,7 +716,7 @@ };break; case ST_CSI_INTER: { - if(0x20 <= c && c <= 0x2F) + if(0x20 <= (int)c.toLatin1() && (int)c.toLatin1() <= 0x2F) { m_ansiInter += c; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/core.cpp new/gede-2.21.1/src/core.cpp --- old/gede-2.20.2/src/core.cpp 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/core.cpp 2024-12-01 09:41:54.000000000 +0100 @@ -132,10 +132,9 @@ { if(fmt == FMT_CHAR) { - QChar c = m_data.toInt(); - char clat = c.toLatin1(); - if(isprint(clat)) - valueText = QString::asprintf("%d '%c'", (int)m_data.toInt(), clat); + QChar c = m_data.toChar(); + if(c.isPrint()) + valueText = QString::asprintf("%d '%c'", (int)m_data.toInt(), c.toLatin1()); else valueText = QString::asprintf("%d ' '", (int)m_data.toInt()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/execombobox.h new/gede-2.21.1/src/execombobox.h --- old/gede-2.20.2/src/execombobox.h 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/execombobox.h 2024-12-01 09:41:54.000000000 +0100 @@ -18,7 +18,11 @@ ExeComboBox(QWidget *parent = NULL); virtual ~ExeComboBox(); +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + void setFilter(QRegularExpression filter) { m_filter = filter; }; +#else void setFilter(QRegExp filter) { m_filter = filter; }; +#endif void setSearchAreas(int areas) { m_areas = areas; }; @@ -27,7 +31,11 @@ void showPopup(); private: +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QRegularExpression m_filter; +#else QRegExp m_filter; +#endif int m_areas; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/mainwindow.cpp new/gede-2.21.1/src/mainwindow.cpp --- old/gede-2.20.2/src/mainwindow.cpp 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/mainwindow.cpp 2024-12-01 09:41:54.000000000 +0100 @@ -2250,8 +2250,12 @@ QString item = list[i].trimmed(); if(!item.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(item)); +#else QRegExp rx(item); rx.setPatternSyntax(QRegExp::Wildcard); +#endif m_funcFilterText.append(rx); } } @@ -2296,8 +2300,12 @@ QString item = list[i].trimmed(); if(!item.isEmpty()) { +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(item)); +#else QRegExp rx(item); rx.setPatternSyntax(QRegExp::Wildcard); +#endif m_classFilterText.append(rx); } } @@ -2369,9 +2377,15 @@ // Does the filter match the name? for(int j = 0;j < m_classFilterText.size() && isMatch == true;j++) { +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QRegularExpression &rx = m_classFilterText[j]; + if(!rx.match(className).hasMatch()) + isMatch = false; +#else QRegExp &rx = m_classFilterText[j]; if(rx.indexIn(className) == -1) isMatch = false; +#endif } if(isMatch) @@ -2434,9 +2448,15 @@ QString name = tag.getLongName(); for(int j = 0;j < m_funcFilterText.size() && isMatch == true;j++) { +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QRegularExpression &rx = m_funcFilterText[j]; + if(!rx.match(name).hasMatch()) + isMatch = false; +#else QRegExp &rx = m_funcFilterText[j]; if(rx.indexIn(name) == -1) isMatch = false; +#endif } // Add the item if it matches diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/mainwindow.h new/gede-2.21.1/src/mainwindow.h --- old/gede-2.20.2/src/mainwindow.h 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/mainwindow.h 2024-12-01 09:41:54.000000000 +0100 @@ -13,7 +13,12 @@ #include <QApplication> #include <QMap> #include <QLabel> + +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +#include <QRegularExpression> +#else #include <QRegExp> +#endif #include "consolewidget.h" #include "ui_mainwindow.h" @@ -218,8 +223,13 @@ int m_currentLine; //!< The linenumber (first=1) which the program counter points to. QList<StackFrameEntry> m_stackFrameList; QMenu m_popupMenu; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QVector<QRegularExpression> m_funcFilterText; //!< Filter for the function list. + QVector<QRegularExpression> m_classFilterText; //!< Filter for the class list. +#else QVector<QRegExp> m_funcFilterText; //!< Filter for the function list. QVector<QRegExp> m_classFilterText; //!< Filter for the class list. +#endif Settings m_cfg; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/memorydialog.cpp new/gede-2.21.1/src/memorydialog.cpp --- old/gede-2.20.2/src/memorydialog.cpp 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/memorydialog.cpp 2024-12-01 09:41:54.000000000 +0100 @@ -12,6 +12,10 @@ #include "core.h" #include "util.h" +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) +#include <QRegularExpression> +#endif + #define SCROLL_ADDR_RANGE 0x10000ULL QByteArray MemoryDialog::getMemory(quint64 startAddress, int count) @@ -54,7 +58,11 @@ // Starts with a '0x...' or '0X..'? if(text.startsWith("x") || text.startsWith("X")) text = "0" + text; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + else if(text.lastIndexOf(QRegularExpression("[a-zA-Z]+")) != -1) +#else else if(text.lastIndexOf(QRegExp("[a-zA-Z]+")) != -1) +#endif { text = "0x" + text; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/opendialog.cpp new/gede-2.21.1/src/opendialog.cpp --- old/gede-2.20.2/src/opendialog.cpp 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/opendialog.cpp 2024-12-01 09:41:54.000000000 +0100 @@ -44,7 +44,11 @@ connect(m_ui.comboBox_projDir, SIGNAL(currentIndexChanged(int)), SLOT(onProjDirComboChanged(int))); m_ui.comboBox_gdbCommand->setSearchAreas(ExeComboBox::UseEnvPath); +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + m_ui.comboBox_gdbCommand->setFilter(QRegularExpression("gdb(?!tui|server)")); +#else m_ui.comboBox_gdbCommand->setFilter(QRegExp("gdb(?!tui|server)")); +#endif #if QT_VERSION >= QT_VERSION_CHECK(5,3,0) m_ui.plainTextEdit_initCommands->setPlaceholderText("Example: \"set substitute-path '/src' '/src2' # a comment\""); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/processlistdialog.cpp new/gede-2.21.1/src/processlistdialog.cpp --- old/gede-2.20.2/src/processlistdialog.cpp 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/processlistdialog.cpp 2024-12-01 09:41:54.000000000 +0100 @@ -101,7 +101,11 @@ #if __APPLE__ prc.mtime.setTime_t(buf.st_mtime); #else +#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) + prc.mtime.setSecsSinceEpoch(buf.st_mtim.tv_sec); +#else prc.mtime.setTime_t(buf.st_mtim.tv_sec); +#endif #endif prc.m_exePath = procDirPath + "/exe"; QFile f(prc.m_exePath); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gede-2.20.2/src/version.h new/gede-2.21.1/src/version.h --- old/gede-2.20.2/src/version.h 2024-11-24 22:06:41.000000000 +0100 +++ new/gede-2.21.1/src/version.h 2024-12-01 09:41:54.000000000 +0100 @@ -10,8 +10,8 @@ #define FILE__VERSION_H #define GD_MAJOR 2 -#define GD_MINOR 20 -#define GD_PATCH 2 +#define GD_MINOR 21 +#define GD_PATCH 1 #endif // FILE__VERSION_H
