diff options
32 files changed, 3280 insertions, 83 deletions
diff --git a/dosbox-x/README.md b/dosbox-x/README.md index 50c2684..fb1cc9b 100644 --- a/dosbox-x/README.md +++ b/dosbox-x/README.md @@ -1,6 +1,8 @@ # README for Dosbos-x This is a dpkg for [dosbox-x](https://dosbox-x.com/) +DEPRECATED! Devuan now has this in the official repos. It entered unstable a few months after I converted this package build, so around 2023-09. + ## Upstream The original application is at the above link. This repo <https://bgstack15.ddns.net/cgit/stackrpms> is the original location of the dpkg recipe. diff --git a/mediaelch/README.md b/mediaelch/README.md new file mode 100644 index 0000000..401d558 --- /dev/null +++ b/mediaelch/README.md @@ -0,0 +1,32 @@ +# README for MediaElch +This is a dpkg for [MediaElch](https://www.kvibes.de/mediaelch/). This is for editing .nfo files for media files. + +## Upstream +The upstream app source is at [github](https://github.com/Komet/MediaElch/). Upstream even provides a few [dpkgs for a few distros](https://mediaelch.github.io/mediaelch-doc/download/linux.html#linux-repositories), but I want to package my own because I can. + +## Alternatives +TinyMediaManager is only freemium and also some java monstrosity I wasn't able to compile even the libre bits. + +I have not tried the binary releases of MediaElch. + +## Reason for existence +I want to compile it myself. + +## Using +My builds should be on my [obs space](https://build.opensuse.org/project/show/home:bgstack15). + +## Dependencies +See file [debian/control](debian/control) for that. + +## Building +Standard debuild. Be sure to get the git submodules. + + + git submodule update --init + + +See upstream's [build docs](https://mediaelch.github.io/mediaelch-doc/contributing/build/index.html). + +## References + +All links seen above. diff --git a/mediaelch/debian/_service b/mediaelch/debian/_service new file mode 100644 index 0000000..859ed94 --- /dev/null +++ b/mediaelch/debian/_service @@ -0,0 +1,29 @@ +<services> + <service name="tar_scm"> + <param name="scm">git</param> + <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param> + <param name="subdir">mediaelch/debian</param> + <param name="filename">debian</param> + <param name="revision">mediaelch-bump</param> + <param name="version">_none_</param> + </service> + <service name="recompress"> + <param name="file">*.tar</param> + <param name="compression">xz</param> + </service> + <service name="tar_scm"> + <param name="scm">git</param> + <param name="url">https://github.com/Komet/MediaElch</param> + <param name="revision">v2.10.6</param> + <param name="version">_none_</param> + <param name="submodules">enable</param> + </service> + <service name="recompress"> + <param name="file">*.tar</param> + <param name="compression">gz</param> + </service> + <service name="extract_file"> + <param name="archive">*.tar.xz</param> + <param name="files">*/*.dsc</param> + </service> +</services> diff --git a/mediaelch/debian/changelog b/mediaelch/debian/changelog new file mode 100644 index 0000000..c29d2a3 --- /dev/null +++ b/mediaelch/debian/changelog @@ -0,0 +1,544 @@ +mediaelch (2.10.6.4-1+stackrpms) obs; urgency=medium + + * Fork for stackrpms + + -- B. Stack <bgstack15@gmail.com> Fri, 05 Apr 2024 19:23:13 -0400 + +mediaelch (2.10.6.4-1~jammy) jammy; urgency=medium + + * next build + + -- Andre Meyering <info@andremeyering.de> Sun, 03 Dec 2023 18:20:43 +0100 + +mediaelch (2.10.4-1) bionic; urgency=medium + + * next release + + -- Andre Meyering <info@andremeyering.de> Sun, 30 Jul 2023 17:30:00 +0100 + +mediaelch (2.10.2-1) bionic; urgency=medium + + * next release + + -- Andre Meyering <info@andremeyering.de> Sat, 01 Jul 2023 12:30:00 +0100 + +mediaelch (2.10.0-1) bionic; urgency=medium + + * next release + + -- Andre Meyering <info@andremeyering.de> Sun, 22 Jan 2023 12:30:00 +0100 + +mediaelch (2.8.18-1) bionic; urgency=medium + + * next release + + -- Andre Meyering <info@andremeyering.de> Fri, 28 Oct 2022 12:30:00 +0100 + +mediaelch (2.8.16-1) bionic; urgency=medium + + * next release + + -- Andre Meyering <info@andremeyering.de> Sun, 13 Mar 2022 11:30:00 +0100 + +mediaelch (2.8.14-1) xenial; urgency=medium + + * next release + + -- Andre Meyering <info@andremeyering.de> Sun, 06 Feb 2022 13:46:14 +0100 + +mediaelch (2.8.8-1) bionic; urgency=medium + + * next build + + -- Andre Meyering <info@andremeyering.de> Mon, 26 Apr 2021 18:03:46 +0200 + +mediaelch (2.8.6-1) bionic; urgency=medium + + * next build + + -- Andre Meyering <info@andremeyering.de> Fri, 22 Jan 2021 13:34:28 +0100 + +mediaelch (2.8.4-1) bionic; urgency=medium + + * next build + + -- Andre Meyering <info@andremeyering.de> Sat, 09 Jan 2021 11:12:48 +0100 + +mediaelch (2.8.2-1) bionic; urgency=medium + + * next build + + -- Andre Meyering <info@andremeyering.de> Sun, 20 Dec 2020 13:14:07 +0100 + +mediaelch (2.8.2-1) vivid; urgency=low + + * Update to MediaElch v2.8.2 + + -- Andre Meyering <info@andremeyering.de> Sun, 20 Dec 2020 12:00:00 +0200 + + +mediaelch (2.8.0-1) vivid; urgency=low + + * Update to MediaElch v2.8.0 + + -- Andre Meyering <info@andremeyering.de> Sun, 13 Dec 2020 12:00:00 +0200 + + + mediaelch (2.6.6-1) vivid; urgency=low + + * Fix AEBN crash when scraping a movie (#910) + * Select correct language for TMDb in the movie search dialog (#916) + * Windows: Fix scanning of concerts (#814) + * Downloads Section: Fix crash when importing items (#828) + * Downloads Section: Fix invalid file sizes (#829) + * TV episodes: Manually edited writers and directors were not saved (#933) + * TV shows: Fix TV shows always being reloaded from disk (#732) + * UI: Fix text color in messages boxes (#942) + * HotMovies: Fix rating scraping + * Trailer Download: Fix downloading trailers for many movies (#940) + * TV Tunes Download: Fix crash when aborting download and restarting it (#940) + * Movie: Don't save runtime from file if it cannot be detected (#604) + * TV show file searcher now allows spaces between episode and season (#513) + * Image Preview: Fix centering of image dialog (#863) + * Export: The generated folder name now also contains seconds (#935) + * Always write the episode guide URL to TV show NFOs using TheTvDb format (#652) + * Fanart.tv: Print better error messages for shows and movies that cannot be found (#900) + * TMDb: Update available languages to support official translations (#901) + * Movies: If movies are sorted by "name", the movie's sort title is used if + set and the name otherwise (#919) + * IMDb: Use higher image resolution for actors (#920) + * Movie Poster: Make it possible to set a random screenshot as the movie's poster (#934) + * TV show: Also load TV show posters when searching for new season posters (#600) + * TV show: Remove suffix (e.g. `.mkv`) from default episode names (#513) + * Set MediaElch specific HTTP User-Agent header for most HTTP requests (#912) + * Updater: Use new MediaElch meta repository for version checks (#896) + * Download Section: Refactor the file searcher to make it non-blocking and + improve the overall performance (#830) + * Logging: Respect `QT_MESSAGE_PATTERN` and use better defaults + * Replace all old-style `SIGNAL`/`SLOT` connections with new-style ones. + + -- Andre Meyering <info@andremeyering.de> Sat, 18 Apr 2020 12:00:00 +0200 + + + mediaelch (2.6.4-1) vivid; urgency=low + + * Fix TV shows sorting and possible crashes if "Show missing episodes" is enabled (#789, #883) + * Fix hanging window if the custom movie scraper is selected but no valid scraper is found. + * Fix `{{ *.RATING }}` not being replaced in exports if a media item has no rating + * Fix movie label color not being shown (#803) + * Fix default language selection in movie scraper dialog + * NFO: Only write `<originaltitle>` if it's different from `<title>` (#812) + * Fix IMDb runtime scraping (#810) + * Update TMDb base URL for downloading images (#807) + The very old subdomain has been taken offline. We now use the new one. + * Fix TMDb scraper language in dialog window (#813) + Scraper language wasn't the one saved in settings but always "English". + * About Dialog: Fix MediaInfo version string in developer information (#790) + * Movie/TvShow: Only parse valid `premiered` tags (#827) + * Fix crash when no TV show is selected + * Fix missing TheTvDb ID in episode NFO files (#788) + * Don't write TheTvDb v1 episode-guide URLs to TV show NFOs (#652) + * Show "Dolby TrueHD" media flag for "truehd" audio codec + * Fix audio codec recognition for newer MediaInfoLib versions (#797) + * Fix "Add to synchronization queue" feature for episodes and TV shows (#850) + * Allow IMDb IDs with 8 digits (previously only 7 digits allows) (#855) + * Fix actors having wrong image after removing one actor (#859) + * TMDb: Load more movie collection details (#800) + * ADA search: Don't filter for DVDs, fix overview scraping of some movies (#819) + * Movie Search Dialog: Add error message label + * TheTvDb: Use API v2 (JSON API instead of old XML API) (#487, #432, #528) + * Episode widget: add TheTvDb ID and IMDb ID fields + * AdvancedSettings: Better input validation (issues are printed to the debug log) (#743) + * AdvancedSettings: Add experimental exclude patterns (#840) + * Add `en_US` language file for better singular/plural handling + * Better network error reporting for scraping TV shows and movies (#870) + * Better error reporting in the image dialog (#864, #874) + + -- Andre Meyering <info@andremeyering.de> Sun, 8 Feb 2020 12:00:00 +0200 + + +mediaelch (2.6.2-1) vivid; urgency=low + + * Fix IMDb tag scraping (#649) + * Fix TMDb issue with HTML characters in overview/plot (#651) + * `Ctrl+A` works in movie and concert section (#647) + * Fix crash when "Load missing episodes" is enabled (#669) + * Filter "Movie has no IMDb ID" is inversed (#680) + * Window positions not saved (#679) + * Country mappings not used in TMDb (#689) + * Windows: Stream Details do not load (#688) + * Crashes on macOS when scanning episodes due to a Qt bug (#641) + * Fix ADE scraper (#703, #725) + * Fix TV shows always beeing reloaded (#732) + * Fix incompatibilities with Kodi v17 NFO files (#719) + * Fix race-condition in DownloadManager (#766) + * Update French translation (#646) + * Add more subtitle formats (#661) + * UI: Fix list/table style for dark themes (#640) + * UI: Fix stuck splitter cursor (#659) + * UI: Restructured search windows (#660) + * Windows: Update MediaInfo (#688) + * Windows: Update to Qt 5.12 and fix style issues (#678) + * Kodi: Use new syntax for ratings for movies and tvshows (#516) + * Kodi: Add missing "aspect" attribute to thumbs (#665) + * Settings: Color paths red if directories are not readable (#730) + * Add `{{ MOVIE.LABEL }}` placeholder in templates (#715) + * Add experimental command line interface (#720) + * Add userrating field to movies + * Add Kodi v16/v17/v18 switcher (#719) + * Make episode thumbnail size configurable in `advancedsettings.xml` (#776) + * Implement ScraperSettings class for better mocking + * Use `QVector<T>` instead of `QList<T>` as the default container + * Reorganize project structure + * Add CMake build system (#700) + * Add `DISABLE_UPDATER` option in QMake and CMake for package maintainers (#763) + * Require Qt 5.6 or later (#780) + + -- Andre Meyering <info@andremeyering.de> Sun, 13 Sep 2019 19:00:00 +0200 + + +mediaelch (2.6.0-1) vivid; urgency=low + + * Add user documentation (#531) + * Use HTTPS for scraping (#371) + * Set UI language in `advancedsettings.xml` (#411) + * Load *all* tags from IMDb (#469) + * Add more audio and video codecs (#524, #530) + * Remove deprecated Cinefacts (#370) + * Remove deprecated Coverlib (#369) + * Remove deprecated MediaPassion (#449) + * Remove deprecated MovieMaze (#386) + * Support KDE Breeze Dark theme (#407) + * Use new Kodi XML syntax for movie set names (#554) + * Add context menu in movie duplicate view (#591) + * Add AEBN genre option (#590) + * Select scraper language in movie search panel (#442) + * Concert Renamer (#574) + * Scrape TV show tags when using IMDb + * Detect duplicate movies + * Create subdirectories + * HD-Trailers scraper broken (#445) + * OFDB movie scraper crashes MediaElch (#394) + * IMDB movie poster not loaded (#385) + * IMDB top 250 not scraped (#468) + * IMDB outline/plot scraping broken (#456) + * IMDB genres/studios/... scraping broken (#556) + * studio name not exported (#392) + * TvShow status not written to `.nfo` file (#380) + * HTML entities in export not escaped (#391) + * multi scraper does not load all episode thumbnails (#415) + * studio mapping for TvShow episodes (#459) + * using filters crashes MediaElch (#504) + * wrong filter tooltips (#506) + * concert extra fanart not saved (#529) + * ADE search does not return results (#565) + * backdrop not loaded using ADE (#519) + * adult scrapers broken (#367) + * VideoBuster does not load certification in special cases (#571) + * *fanart.tv* music scraper broken + * Placeholder `<showTitle>` does not work for renaming season folders (#553) + * UI: line break in tree views (#406) + * UI: add 4k and 8k resolution flag (#446) + * UI: show green ID flag only if IMDB is valid (#471) + + -- Andre Meyering <info@andremeyering.de> Sun, 06 Jan 2019 12:00:00 +0200 + +mediaelch (2.4.2-1) vivid; urgency=low + + * Bugfix: UniversalMusicScraper broken + + -- Daniel Kabel <info@kvibes.de> Fri, 01 Jul 2016 09:32:20 +0200 + +mediaelch (2.4.1-1) vivid; urgency=low + + * Renamer: Show results in table view + * Export: Add IMDB ID to template + * IMDB: Adjusted scraper to new layout + * StreamDetails: Stereomode not detected + * IMDB: Rating and votes sometimes not scraped + * TheTVDB: Get votes for episodes and shows + * Image capture: Prevent possible crash + * StreamDetails: Language of subtitle not detected + * TvShows: Possible crash when scanning for new episodes of a single show + * TvShowEpisodes: epbookmark not saved + * AdvancedSettings: Use first studio only not working + + -- Daniel Kabel <info@kvibes.de> Sun, 20 Mar 2016 14:48:28 +0100 + +mediaelch (2.4.0.4-1) vivid; urgency=low + + * Custom TV scraper + * Scrape multiple TV shows/episodes + * Add option to manually edit the nfo file + * IMDB scraper for TV Shows + * Support for external subtitles + * Handle network timeouts in scrapers + * Improve ignored words filter + * Option to open folder for music artists and albums + * Music: Store release id instead release group id + * Improve album search query + * Don't reload after rename + * Musicscraper: Show musicbrainz release id in search results + * Move TV shows with new items to the top + * Don't remove custom tags in nfo files + * StreamDetails: Use Channel(s)_Original if available + * Improve UI rendering in Windows + * Get and store IMDB ID for TV show episodes + * Support for TV show status (continuing/ended) + * Use lowercase video and audio codec in streamdetails + * Save all selected items when saving + * Votes and top 250 for TV shows and episodes + * TV Shows: Improved UI in listview + * Support image formats with wrong file extension + * Musicscraper: Label, release date and artist is not set + * IMDB: Studios not detected + * Windows: Black screen when started via RDP + * Hotmovies scraper broken + * StreamDetails: Sometimes not loaded in Windows when filename contains special characters + * Crash when selecting open folder on empty list + + -- Daniel Kabel <info@kvibes.de> Sun, 06 Dec 2015 18:03:23 +0100 + + +mediaelch (2.3.2.1-1) vivid; urgency=low + + * Fixed dependencies for wily + + -- Daniel Kabel <info@kvibes.de> Thu, 15 Oct 2015 10:16:06 +0100 + +mediaelch (2.3.2-1) vivid; urgency=low + + * Write urls to nfos by default + + -- Daniel Kabel <info@kvibes.de> Mon, 12 Oct 2015 20:22:31 +0100 + +mediaelch (2.3.1.1-1) vivid; urgency=low + + * Fixed package name in debian control file + + -- Daniel Kabel <daniel.kabel@me.com> Sun, 11 Oct 2015 21:39:35 +0100 + +mediaelch (2.3.1-1) vivid; urgency=low + + * Bugfix on Coverlib.com scraper + + -- Daniel Kabel <daniel.kabel@me.com> Sat, 10 Oct 2015 21:59:22 +0100 + +mediaelch (2.3.0.2-1) vivid; urgency=low + + * Music: Coverlib.com scraper + * Music: Support for booklets + * Improve UI on retina displays + * Drop images directly to image elements + * Renamer: Options for video/audio codec and number of audio channels + * Renamer: Support IMDB id on directory renaming + * Renamer: Show warning when item has been edited + * Renamer: Support extension also in directory names + * MediaPassion: API URL changed + * Improve IMDB outline scraping + * Detect stream details from BluRay structures + * Advanced Settings: Option to disable saving of thumbs in nfo + * Media Status Columns: Add local trailers + * Play trailer on click + * TMDB: Show results even if TMDB API delivers wrong page count + * Music: Added extra fanarts can not be removed + * Music: Artists and albums with special characters fail to scrape + * Trailer download sometimes not working + * IMDB: Possible hang on multiscrape + * Multiselection on movies when using filters leads to wrong selection + * TvTunes scraper broken + * Synchronization: Updating play count on episodes and concerts failed + * OSX: Settings window not closable in fullscreen + * VideoBuster scraper broken + * Adult DVD Empire scraper broken + * Renamer: Scantype (progressive/interlaced) not respected + + -- Daniel Kabel <daniel.kabel@me.com> Sat, 10 Oct 2015 19:54:26 +0100 + +mediaelch (2.2.2-1) trusty; urgency=low + + * UI: Music multi scrape progress bar doesn't stop + * Renamer: Conditional 3D tag not working + * StreamDetails UI: Audio label on wrong position + * Renamer: Resolution tag is empty for very low resolution files + * Default filename for music disc art should be cdart.png + * Resolution icon not visible + * Music: Deleted images show up again sometimes + * MediaPassion: Images are not loaded + * StreamDetails not loaded when filename contains special characters (Windows only) + * Music multiscrape: Artist thumb and logo are not loaded + * Show IDs in the GUI + + -- Daniel Kabel <daniel.kabel@me.com> Mon, 02 Feb 2015 20:41:49 +0100 + +mediaelch (2.2.1-1) trusty; urgency=low + + * Media Passion: API URL changed + + -- Daniel Kabel <daniel.kabel@me.com> Sun, 25 Jan 2015 11:58:27 +0100 + +mediaelch (2.2-1) trusty; urgency=low + + * Fanart.tv: Add support for personal API keys + * Support for music libraries + * Detect 3D movies from streamdetails + * Export: Add movie filename and path + * Fanart.tv: Use API v3 + * Save last used path when selecting actor images + * Renamer: Add more options + * Play movie/episode/concert on double click + * Fanart.tv: Add support for season posters + * NFO: Correctly save multiple entries + * Fanart.tv: Add support for TV show posters + * Rename XBMC to KODI + * Add icon for DTS-HD HR + * Use icon font for navbar items + * IMDB Scraper: Problems with html tags + * Open Movie Folder not working on smb shares + * TMDB: Sometimes no results are found + * MovieMaze Scraper broken + * List widgets are not resized when resizing main window + * Adult DVD Empire sometimes loads no data + * IMDB: Multiple directors and writers are not scraped + * OSX: Popup window positions are offset (Qt Bug) + * Several issues in set manager + * Stream details are not detected when filename contains special characters + * IMDB Scraper: Genres, Country, Actors sometimes not correctly scraped + * IMDB: Posters not scraped + * TV Shows ordered wrong when episode number >= 100 + * IMDB: Just small actor images are scraped + * IMDB: Outline sometimes not scraped + * Renaming: TV Show directories are always renamed + * IMDB: Release date, director and writer not detected + * New marks stay visible after saving last new item + * MovieMaze: Scraper broken + + -- Daniel Kabel <daniel.kabel@me.com> Fri, 23 Jan 2015 14:42:26 +0100 + +mediaelch (2.1.3-1) trusty; urgency=low + + * Update package for Trusty + + -- Daniel Kabel <daniel.kabel@me.com> Sun, 20 Apr 2014 15:22:13 +0200 + +mediaelch (2.1.2-1) saucy; urgency=low + + * Add info about collection + * Join genres in nfo files + * Rename TV shows: dialog doesn't open ... + * Custom Scraper: Fanart always from fa... + * IMDB scraper sometimes displays no re... + * Only small actor images from imdb + * Windows: dialogs out of desktop + * Aspect ratio saved in localized version + * MediaStatusColumns: Extra Arts don't ... + * Speed up loading of movies from database + * Filter for audio formats + * IMDB scraper doesn't map advanced set... + * Add stream details to export function + + -- Daniel Kabel <daniel.kabel@me.com> Thu, 27 Mar 2014 21:03:37 +0100 + +mediaelch (2.1.1-1) saucy; urgency=low + + * Filescanner dialog not visible + + -- Daniel Kabel <daniel.kabel@me.com> Mon, 17 Mar 2014 11:04:03 +0100 + +mediaelch (2.1-1) saucy; urgency=low + + * OS X Retina display support + * MakeMKV integration + * Option to hide donate button + * Custom labels for movies + * Select startup section + * Export: Remove line breaks genre block + * Words to exclude: add mkv + * Automatically guess import type and folder + * Missing episodes: Hide specials + * Show adult movies from TMDB + * Filter for movies with/without rating + * Replace underscores with spaces in movie names + * Only update movies with id in custom scraper + * Use different IMDB Scraper (mymovieapi.com down) + * Read ratings with comma separated decimals + * Save last used path when manually selecting images + * Trim title from the tv db + * Context menus stay sometimes in front + * StreamDetails: Aspect ratio sometimes displayed as 0.000 + * XBMC synchronization broken + * Disable filesystemwatcher for imports + * Multiscraping: IMDB id is set as TMDB id + * Settings: Movie set artwork filenames are not display correctly + * MovieMaze: Wrong encoding + * Some episode names lead to detecting multiple episodes + * Extracting password protected files fails + * Updating new episodes with dvd order fails + * Trailers are not renamed + * Scraper adds sometimes "id" before IMDB ids + * Multiscrape: Only movies with id are scraped + + -- Daniel Kabel <daniel.kabel@me.com> Sun, 16 Mar 2014 17:31:45 +0100 + +mediaelch (2.0.6-1) raring; urgency=low + + * Show all banners for seasons + * Improve tabs ui + * Import: Disable automatic reload during extraction + * Streamdetails detects runtime of 0 + * Selected items in scrapers are not saved + * Episodes can not be selected + * Custom scraper broken + * TV Shows: Selected item has no background color in Windows + * Import: Single subtitles are detected as importable item + * Second window in Linux visible + * Choosing local images broken + + -- Daniel Kabel <daniel.kabel@me.com> Thu, 31 Oct 2013 19:16:23 +0100 + +mediaelch (2.0-1) raring; urgency=low + + * HD-Trailers.net: Add apple trailer download support + * Media Passion: Support for Logos and ClearArts + * Language Support in fanart.tv + * Option to update only movies with IMDb Id + * Import movies, episodes and concerts + * Show missing Episodes + * Update notification + * BluRay/DVD Disc option in fanart.tv + * Scrape posters from fanart.tv + * Portable mode via advancedsettings.xml + * Scraper for Adult DVD Empire + * Scraper for AEBN + * Scraper for HotMovies + * Upgrade to Qt5 + * Improve exclude words detection + * Filter for movie sets + * Filter for IMDb ID + * Exclude words also in directory names + * Search by IMDb id or TMDb id by default + * Also rename .srt subtitles + * Actors for TV show episodes + * TheTvDb: Search by ID + * Speed up loading items + * Add warning for extra fanarts when sep. folders is not cheked + * GUI updates + * Fix hd-trailers.net scraping + * Poster naming of stacked files + * Wrong parsing of filenames from stacked movies + * Skip dots in movie titles when searching + * TV show season fanart not found/scraped + * Media Passion: Titles with accents give no results + * Renaming fails if new name only differs in capitalization + * Adjust MovieMaze Scraper + * Cinefacts scraper broken + * Check DVD aired order + * Runtime of *.ts files is not detected + * Images from SMB shares under Windows cannot be chosen + * Filescanner might skip some movies + * MediaPassion: Discart sometimes not found + * MediaPassion: Original title not scraped + * Some images are not renamed when renaming movies + * TV Show list jumps to not clicked items + + -- Daniel Kabel <daniel.kabel@me.com> Mon, 28 Oct 2013 16:59:24 +0100 diff --git a/mediaelch/debian/control b/mediaelch/debian/control new file mode 100644 index 0000000..f6f2c9d --- /dev/null +++ b/mediaelch/debian/control @@ -0,0 +1,33 @@ +Source: mediaelch +Section: misc +Priority: optional +Maintainer: B. Stack <bgstack15@gmail.com> +XSBC-Original-Maintainer: Andre Meyering <info@andremeyering.de> +Standards-Version: 4.6.2 +Build-Depends: debhelper-compat (= 13), + cmake, + libmediainfo-dev, + libquazip1-qt6-dev, + libxkbcommon-dev, + libzen-dev, + qt6-base-dev, + qt6-multimedia-dev, + qt6-svg-dev, + qt6-tools-dev, +Homepage: https://mediaelch.github.io/mediaelch-doc/ +Rules-Requires-Root: no +Vcs-Browser: https://github.com/Komet/MediaElch/ +Vcs-Git: https://github.com/Komet/MediaElch.git + +Package: mediaelch +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libmediainfo0v5, + libzen0v5, +Description: Media Manager for Kodi + MediaElch is your Media Manager for handling movies, TV shows, concerts and + music in Kodi. It is designed to gather information from various movie + databases on the internet and store these information directly to Kodis + database or in nfo files. MediaElch is also downloading movie posters, + backdrops, fan arts and pictures of the actors. diff --git a/mediaelch/debian/copyright b/mediaelch/debian/copyright new file mode 100644 index 0000000..2aead39 --- /dev/null +++ b/mediaelch/debian/copyright @@ -0,0 +1,47 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mediaelch +Source: https://www.mediaelch.de/ +Copyright: 2012-2023 Daniel Kabel <info@kvibes.de> + +Files: * +Copyright: 2012-2018 Daniel Kabel <info@kvibes.de> + 2018-2023 Andre Meyering <info@andremeyering.de> +License: LGPL-3.0-only + +Files: third_party/quazip/* +Copyright: + 2005-2012 Sergey A. Tachenov +License: LGPL-2.1-only + +License: LGPL-2.1-only + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser Public License as published by + the Free Software Foundation; either version 2.1, or (at your option) + any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +X-Comment: On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-3.0-only + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser Public License as published by + the Free Software Foundation in version 3. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +X-Comment: On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-3'. diff --git a/mediaelch/debian/docs b/mediaelch/debian/docs new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/mediaelch/debian/docs diff --git a/mediaelch/debian/mediaelch+stackrpms.dsc b/mediaelch/debian/mediaelch+stackrpms.dsc new file mode 100644 index 0000000..17ea404 --- /dev/null +++ b/mediaelch/debian/mediaelch+stackrpms.dsc @@ -0,0 +1,17 @@ +Format: 3.0 (quilt) +Source: mediaelch +Binary: mediaelch +Architecture: any +Version: 2.10.6.4-1+stackrpms +Maintainer: B. Stack <bgstack15@gmail.com> +XSBC-Original-Maintainer: Andre Meyering <info@andremeyering.de> +Homepage: http://www.mediaelch.de +Standards-Version: 4.1.4 +Vcs-Browser: https://github.com/Komet/MediaElch/ +Vcs-Git: https://github.com/Komet/MediaElch.git +Build-Depends: debhelper (>= 8.0.0), qtchooser, cdbs, libmediainfo0 | libmediainfo0v5, libmediainfo-dev, zlib1g-dev, libzen-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libpulse-dev, cmake, libquazip1-qt6-dev, libxkbcommon-dev, qt6-base-dev, qt6-multimedia-dev, qt6-svg-dev, qt6-tools-dev +Package-List: + mediaelch deb misc extra arch=any +Files: + 00000000000000000000000000000000 1 mediaelch.orig.tar.xz + 00000000000000000000000000000000 1 mediaelch.debian.tar.xz diff --git a/mediaelch/debian/rules b/mediaelch/debian/rules new file mode 100755 index 0000000..6dc3662 --- /dev/null +++ b/mediaelch/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +export QT_SELECT = 6 + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + -DUSE_EXTERN_QUAZIP:BOOL=ON diff --git a/mediaelch/debian/source/format b/mediaelch/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/mediaelch/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/notepadpp/README.md b/notepadpp/README.md index b1e1ff8..fb6b95d 100644 --- a/notepadpp/README.md +++ b/notepadpp/README.md @@ -12,9 +12,10 @@ Package `notepadqq` does not accomplish the same effect I wanted. ## Reverse dependency matrix Distro | notepadpp version ---------- | ---------------- -Devuan | 8.4.7 +Devuan | 8.6.9 ## Additional info +To run `osc` on Devuan as of 2024-07, you have to install `python3-zombie-imp`. ## Differences from upstream None diff --git a/notepadpp/debian/changelog b/notepadpp/debian/changelog index 56ec59e..ed236ac 100644 --- a/notepadpp/debian/changelog +++ b/notepadpp/debian/changelog @@ -1,3 +1,56 @@ +notepadpp (8.6.9-1+stackrpms) obs; urgency=medium + + * Upstream updates + * Make installation and updates easy & quiet by adding "Yes (Silent)" + button. (Fix #8514) + * Add new options '/closeRunningNpp' & '/runNppAfterSilentInstall' in + the installer. (Implement #15230, implement #15280) + * Fix crash of "Next Search Result" command on the empty search result. + (Fix #15247) + * Fix the regression where the Find dialog size is not remembered + across sessions. (Fix #15294) + * Fix the regression of content lost by using Encoding "Convert to..." + commands. (Fix #15324, #15271, #3054, possibly #9426) + * Fix the regression of exception/crash on Windows Server Core 2022. + (Fix #15313) + * Prevent DirectWrite from being enabled under Windows Sever. (commit) + * Enhance the quality of Fluent toolbar icon sets for different DPI + settings. (Fix #15253) + * Improve the look & feel of tabbar close button in dark mode. (Fix + #15321, implement #15326) + * Improve the dark mode tab bar icon in the search results panel. + (Implement #15286) + * Add ability to pre-populate the predefined color sets for custom + tones. (Fix #15055) + * Add "Show All Character" popup menu on toolbar button. (Fix #14832) + * Fix the rectangular selection copy-paste bug. (Fix #15139, #15151) + * Allow opening shortcut files (*.lnk) directly if the file extension + is changed. (Fix #9643, #11089, #10139) + * Fix the lost panels issue. (Fix #13084) + * Add Backspace unindent option. (Fix #15180) + * Fix CSS more indentation bug. (Fix #14962) + * Include F13-F24 keys in Shortcut Mapper. (Fix #11975) + * Fix the problem where the last empty clean untitled tab cannot be + closed after renaming. (Fix #15306) + * Add plugin a command (NPPM_SETUNTITLEDNAME) to rename untitled tab. + (Fix #8916) + * Display a message box with information about disabled backward regex + searching. (Fix #15239) + * Fix the display glitch for unsaved tabs containing tab characters. + (Fix #15202) + * Fix status bar and tab bar flicker during the GUI updated (fixed only + for dark mode). (Fix #15260) + * Fix the issue with "Begin/End Select" command after deletion. (Fix + #15221) + * Resolve the integer overflow problem in the Column Editor. (Fix + #15167) + * Adjust the position of hits text in the File Progress dialog. (Fix + #13426, #15244) + * Fix the deployment of other software blocked due to NppShell. (Fix + #62) + + -- B. Stack <bgstack15@gmail.com> Tue, 16 Jul 2024 09:52:52 -0400 + notepadpp (8.6.8-1+stackrpms) obs; urgency=medium * Upstream updates diff --git a/scite/debian/_service b/scite/debian/_service index 132c807..a0ff643 100644 --- a/scite/debian/_service +++ b/scite/debian/_service @@ -14,8 +14,8 @@ <service name="download_url"> <param name="protocol">https</param> <param name="host">www.scintilla.org</param> - <param name="path">scite550.tgz</param> - <param name="filename">scite_5.5.0.orig.tar.gz</param> + <param name="path">scite552.tgz</param> + <param name="filename">scite_5.5.2.orig.tar.gz</param> </service> <service name="extract_file"> <param name="archive">*.tar.xz</param> diff --git a/scite/debian/changelog b/scite/debian/changelog index 1785025..5c17e48 100644 --- a/scite/debian/changelog +++ b/scite/debian/changelog @@ -1,10 +1,22 @@ -scite (1:5.5.0-100+stackrpms) unstable; urgency=medium +scite (1:5.5.2-100+stackrpms) unstable; urgency=medium * Add stackrpms lua script and customized global.properties * Use lua 5.4.4 * Add epoch so stackrpms scite always has precedence over base package - -- B. Stack <bgstack15@gmail.com> Wed, 01 May 2024 20:20:22 -0400 + -- B. Stack <bgstack15@gmail.com> Fri, 23 Aug 2024 09:41:08 -0400 + +scite (5.5.2-1) unstable; urgency=medium + + * New upstream version 5.5.2 + + -- Andreas Rönnquist <gusnan@debian.org> Wed, 21 Aug 2024 13:32:02 +0200 + +scite (5.5.1-1) unstable; urgency=medium + + * New upstream version 5.5.1 + + -- Andreas Rönnquist <gusnan@debian.org> Mon, 22 Jul 2024 11:40:58 +0200 scite (5.5.0-1) unstable; urgency=medium diff --git a/scite/debian/scite+stackrpms.dsc b/scite/debian/scite+stackrpms.dsc index ef7c5f1..6dde4f5 100644 --- a/scite/debian/scite+stackrpms.dsc +++ b/scite/debian/scite+stackrpms.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: scite Binary: scite Architecture: any -Version: 1:5.5.0-100+stackrpms +Version: 1:5.5.2-100+stackrpms Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://scintilla.org/SciTE.html Standards-Version: 4.7.0 diff --git a/scite/debian/stackrpms.lua b/scite/debian/stackrpms.lua index 21f9257..75a6fd3 100644 --- a/scite/debian/stackrpms.lua +++ b/scite/debian/stackrpms.lua @@ -266,13 +266,14 @@ end -- %Y full year (1998) -- %y two-digit year (98) [00-99] -- %% the character '%' +-- Last modified 2024-07-20-7 09:10 function InsertDateAH() local dow = tostring(math.floor(os.date("%w") + 1)) local d1 = os.date("%Y-%m-%d-") local d2 = os.date(" %H:%M") - editor:AddText(d1..dow..d2) + editor:ReplaceSel(d1..dow..d2) end function InsertDateIso() local date_string = os.date("%Y-%m-%dT%T") - editor:AddText(date_string) + editor:ReplaceSel(date_string) end diff --git a/scite/stackrpms-5.5.1-1.diff b/scite/stackrpms-5.5.1-1.diff new file mode 100644 index 0000000..5a92cae --- /dev/null +++ b/scite/stackrpms-5.5.1-1.diff @@ -0,0 +1,1212 @@ +diff -x '.*.swp' -Naur salsa/scite/debian/changelog stackrpms/scite/debian/changelog +--- salsa/scite/debian/changelog 2024-08-01 10:59:12.585637267 -0400 ++++ stackrpms/scite/debian/changelog 2024-08-01 11:02:03.321637267 -0400 +@@ -1,3 +1,11 @@ ++scite (1:5.5.1-100+stackrpms) unstable; urgency=medium ++ ++ * Add stackrpms lua script and customized global.properties ++ * Use lua 5.4.4 ++ * Add epoch so stackrpms scite always has precedence over base package ++ ++ -- B. Stack <bgstack15@gmail.com> Thu, 01 Aug 2024 11:01:57 -0400 ++ + scite (5.5.1-1) unstable; urgency=medium + + * New upstream version 5.5.1 +diff -x '.*.swp' -Naur salsa/scite/debian/control stackrpms/scite/debian/control +--- salsa/scite/debian/control 2024-05-01 20:16:52.117804014 -0400 ++++ stackrpms/scite/debian/control 2024-05-01 20:24:05.262846855 -0400 +@@ -1,14 +1,13 @@ + Source: scite +-Maintainer: Michael Vogt <mvo@debian.org> +-Uploaders: Antonio Valentino <antonio.valentino@tiscali.it>, +- Andreas Rönnquist <gusnan@debian.org> ++Maintainer: B. Stack <bgstack15@gmail.com> ++XSBC-Original-Maintainer: Michael Vogt <mvo@debian.org> + Section: editors + Priority: optional + Rules-Requires-Root: no + Build-Depends: debhelper-compat (= 13), + libgtk-3-dev, + libglib2.0-dev, +- liblua5.3-dev ++ liblua5.4-dev + Standards-Version: 4.7.0 + Vcs-Browser: https://salsa.debian.org/debian/scite + Vcs-Git: https://salsa.debian.org/debian/scite.git +diff -x '.*.swp' -Naur salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch +--- salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2023-12-30 15:10:24.740185203 -0500 ++++ stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2024-04-04 08:23:08.596651801 -0400 +@@ -36,9 +36,9 @@ + -# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. + -CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) + -CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) +-+# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is. +-+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.3) +-+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.3) +++# stackrpms,3 For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is. +++CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.4) +++CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.4) + gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null) + ifndef prefix + ifdef gnomeprefix +diff -x '.*.swp' -Naur salsa/scite/debian/patches/series stackrpms/scite/debian/patches/series +--- salsa/scite/debian/patches/series 2023-12-04 15:32:55.372321741 -0500 ++++ stackrpms/scite/debian/patches/series 2024-04-04 08:23:08.596651801 -0400 +@@ -2,3 +2,4 @@ + 0002-reproducible_build.patch + 0003-scite-desktop.patch + 0004-Build-with-Debian-packaged-Lua.patch ++use-lua5.4.4.patch +diff -x '.*.swp' -Naur salsa/scite/debian/patches/use-lua5.4.4.patch stackrpms/scite/debian/patches/use-lua5.4.4.patch +--- salsa/scite/debian/patches/use-lua5.4.4.patch 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/patches/use-lua5.4.4.patch 2023-08-19 17:16:15.202653929 -0400 +@@ -0,0 +1,191 @@ ++Name: Patch scite to use distro package of lua, Devuan ++Version: 5.2.3 ++Lua-Version: 5.4.4 ++Author: bgstack15@gmail.com ++Date-Modified: 2022-05-31 ++Message: Generated with the following command ++ ++ sed -r -e 's/checkint\(/checkinteger\(/g;' -e 's/lua_strlen\(/lua_rawlen\(/g;' scite/src/LuaExtension.cxx > ~/LuaExtension.cxx.new ++diff -aur scite/gtk/deps.mak scite/gtk/deps.mak ++--- a/scite/gtk/deps.mak 2022-03-30 20:48:24.000000000 -0400 +++++ b/scite/gtk/deps.mak 2022-04-04 14:47:39.110529717 -0400 ++@@ -469,13 +469,6 @@ ++ ../lua/src/luaconf.h \ ++ ../lua/src/lauxlib.h \ ++ ../lua/src/lualib.h ++-lbitlib.o: \ ++- ../lua/src/lbitlib.c \ ++- ../lua/src/lprefix.h \ ++- ../lua/src/lua.h \ ++- ../lua/src/luaconf.h \ ++- ../lua/src/lauxlib.h \ ++- ../lua/src/lualib.h ++ lcode.o: \ ++ ../lua/src/lcode.c \ ++ ../lua/src/lprefix.h \ ++diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx ++--- a/scite/src/LuaExtension.cxx 2022-03-30 20:48:24.000000000 -0400 +++++ b/scite/src/LuaExtension.cxx 2022-04-04 14:46:35.097978533 -0400 ++@@ -238,7 +238,7 @@ ++ ++ constexpr int paneIndex = lua_upvalueindex(1); ++ check_pane_object(L, paneIndex); ++- const int message = luaL_checkint(L, 1); +++ const int message = luaL_checkinteger(L, 1); ++ ++ lua_pushvalue(L, paneIndex); ++ lua_replace(L, 1); ++@@ -277,7 +277,7 @@ ++ } ++ ++ int cf_scite_constname(lua_State *L) { ++- const int message = luaL_checkint(L, 1); +++ const int message = luaL_checkinteger(L, 1); ++ const char *prefix = luaL_optstring(L, 2, nullptr); ++ const std::string constName = IFaceTable::GetConstantName(message, prefix); ++ if (constName.length() > 0) { ++@@ -308,7 +308,7 @@ ++ } ++ ++ int cf_scite_menu_command(lua_State *L) { ++- const int cmdID = luaL_checkint(L, 1); +++ const int cmdID = luaL_checkinteger(L, 1); ++ if (cmdID) { ++ host->DoMenuCommand(cmdID); ++ } ++@@ -330,7 +330,7 @@ ++ } ++ ++ int cf_scite_strip_set(lua_State *L) { ++- const int control = luaL_checkint(L, 1); +++ const int control = luaL_checkinteger(L, 1); ++ const char *value = luaL_checkstring(L, 2); ++ if (value) { ++ host->UserStripSet(control, value); ++@@ -339,7 +339,7 @@ ++ } ++ ++ int cf_scite_strip_set_list(lua_State *L) { ++- const int control = luaL_checkint(L, 1); +++ const int control = luaL_checkinteger(L, 1); ++ const char *value = luaL_checkstring(L, 2); ++ if (value) { ++ host->UserStripSetList(control, value); ++@@ -348,7 +348,7 @@ ++ } ++ ++ int cf_scite_strip_value(lua_State *L) { ++- const int control = luaL_checkint(L, 1); +++ const int control = luaL_checkinteger(L, 1); ++ std::string value = host->UserStripValue(control); ++ push_string(L, value); ++ return 1; ++@@ -438,7 +438,7 @@ ++ SA::Position rangeStart = 0; ++ SA::Position rangeEnd = 0; ++ ++- const int flags = (nArgs > 2) ? luaL_checkint(L, 3) : 0; +++ const int flags = (nArgs > 2) ? luaL_checkinteger(L, 3) : 0; ++ hasError = (flags == 0 && lua_gettop(L) > nArgs); ++ ++ if (!hasError) { ++@@ -515,7 +515,7 @@ ++ ++ SA::ScintillaCall &sc = host->PaneCaller(pmo->pane); ++ sc.SetTarget(pmo->range); ++- sc.ReplaceTarget(lua_strlen(L, 2), replacement); +++ sc.ReplaceTarget(lua_rawlen(L, 2), replacement); ++ pmo->range.end = sc.TargetEnd(); ++ return 0; ++ } ++@@ -601,7 +601,7 @@ ++ pmo->endPosOrig = 0; ++ pmo->flags = 0; ++ if (nargs >= 3) { ++- pmo->flags = luaL_checkint(L, 3); +++ pmo->flags = luaL_checkinteger(L, 3); ++ if (nargs >= 4) { ++ pmo->range.end = pmo->endPosOrig = luaL_checkinteger(L, 4); ++ if (pmo->range.end < 0) { ++@@ -766,7 +766,7 @@ ++ const int nargs = lua_gettop(L); ++ const char *code = luaL_checkstring(L, 1); ++ const char *name = luaL_optstring(L, 2, code); ++- if (0 == luaL_loadbuffer(L, code, lua_strlen(L, 1), name)) { +++ if (0 == luaL_loadbuffer(L, code, lua_rawlen(L, 1), name)) { ++ lua_call(L, 0, LUA_MULTRET); ++ return lua_gettop(L) - nargs; ++ } else { ++@@ -897,7 +897,7 @@ ++ int loopParamCount = 2; ++ ++ if (func.paramType[0] == iface_length && func.paramType[1] == iface_string) { ++- params[0] = lua_strlen(L, arg); +++ params[0] = lua_rawlen(L, arg); ++ params[1] = SptrFromString(params[0] ? lua_tostring(L, arg) : ""); ++ loopParamCount = 0; ++ } else if ((func.paramType[1] == iface_stringresult) || (func.returnType == iface_stringresult)) { ++@@ -916,8 +916,8 @@ ++ const char *s = lua_tostring(L, arg++); ++ params[i] = SptrFromString(s ? s : ""); ++ } else if (func.paramType[i] == iface_keymod) { ++- const int keycode = luaL_checkint(L, arg++) & 0xFFFF; ++- const intptr_t modifiers = luaL_checkint(L, arg++) & +++ const int keycode = luaL_checkinteger(L, arg++) & 0xFFFF; +++ const intptr_t modifiers = luaL_checkinteger(L, arg++) & ++ static_cast<int>(SA::KeyMod::Shift|SA::KeyMod::Ctrl|SA::KeyMod::Alt); ++ params[i] = keycode | (modifiers<<16); ++ } else if (func.paramType[i] == iface_bool) { ++@@ -1787,7 +1787,7 @@ ++ static int SetLevelAt(lua_State *L) { ++ StylingContext *context = Context(L); ++ const SA::Line line = luaL_checkinteger(L, 2); ++- const int level = luaL_checkint(L, 3); +++ const int level = luaL_checkinteger(L, 3); ++ context->styler->SetLevel(line, static_cast<SA::FoldLevel>(level)); ++ return 0; ++ } ++@@ -1802,7 +1802,7 @@ ++ static int SetLineState(lua_State *L) { ++ StylingContext *context = Context(L); ++ const SA::Line line = luaL_checkinteger(L, 2); ++- const int stateOfLine = luaL_checkint(L, 3); +++ const int stateOfLine = luaL_checkinteger(L, 3); ++ context->styler->SetLineState(line, stateOfLine); ++ return 0; ++ } ++@@ -1880,7 +1880,7 @@ ++ StylingContext *context = Context(L); ++ const SA::Position startPosStyle = luaL_checkinteger(L, 2); ++ const SA::Position lengthStyle = luaL_checkinteger(L, 3); ++- const int initialStyle = luaL_checkint(L, 4); +++ const int initialStyle = luaL_checkinteger(L, 4); ++ context->StartStyling(startPosStyle, lengthStyle, initialStyle); ++ return 0; ++ } ++@@ -1939,7 +1939,7 @@ ++ static int SetState(lua_State *L) { ++ StylingContext *context = Context(L); ++ context->Colourize(); ++- context->state = luaL_checkint(L, 2); +++ context->state = luaL_checkinteger(L, 2); ++ return 0; ++ } ++ ++@@ -1947,13 +1947,13 @@ ++ StylingContext *context = Context(L); ++ context->Forward(); ++ context->Colourize(); ++- context->state = luaL_checkint(L, 2); +++ context->state = luaL_checkinteger(L, 2); ++ return 0; ++ } ++ ++ static int ChangeState(lua_State *L) { ++ StylingContext *context = Context(L); ++- context->state = luaL_checkint(L, 2); +++ context->state = luaL_checkinteger(L, 2); ++ return 0; ++ } ++ ++ +diff -x '.*.swp' -Naur salsa/scite/debian/rules stackrpms/scite/debian/rules +--- salsa/scite/debian/rules 2023-07-31 11:35:56.033600691 -0400 ++++ stackrpms/scite/debian/rules 2024-04-04 08:23:08.596651801 -0400 +@@ -43,6 +43,9 @@ + mv -f $(CURDIR)/debian/scite/usr/share/scite/*.txt $(CURDIR)/debian/scite/usr/share/doc/scite/ + mv -f $(CURDIR)/debian/scite/usr/share/scite/*.jpg $(CURDIR)/debian/scite/usr/share/doc/scite/ + mv -f $(CURDIR)/debian/scite/usr/share/scite/*.png $(CURDIR)/debian/scite/usr/share/doc/scite/ ++ @#stackrpms,3 ++ cp -p debian/stackrpms.lua $(CURDIR)/debian/scite/usr/share/scite/ ++ install -D -p -m0666 debian/SciTEGlobal.properties $(CURDIR)/debian/scite/etc/scite/ + for f in $(CURDIR)/debian/scite/usr/share/doc/scite/*.html; do \ + dh_link usr/share/doc/scite/$$(basename $$f) usr/share/scite/$$(basename $$f); \ + done +diff -x '.*.swp' -Naur salsa/scite/debian/SciTEGlobal.properties stackrpms/scite/debian/SciTEGlobal.properties +--- salsa/scite/debian/SciTEGlobal.properties 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/SciTEGlobal.properties 2024-04-04 08:23:08.592651755 -0400 +@@ -0,0 +1,597 @@ ++# SciTEGlobal.properties placed by scite package for stackrpms ++# Global initialisation file for SciTE ++# For Linux, place in $prefix/share/scite ++# For Windows, place in same directory as SciTE.EXE (or Sc1.EXE) ++# Documentation at http://www.scintilla.org/SciTEDoc.html ++ ++# Globals ++ ++# Window sizes and visibility ++if PLAT_WIN ++ position.left=0 ++ position.top=0 ++if PLAT_GTK ++ position.left=5 ++ position.top=22 ++position.width=$(scale 576) ++position.height=$(scale 740) ++#position.maximize=1 ++#position.tile=1 ++#full.screen.hides.menu=1 ++#minimize.to.tray=1 ++split.vertical=0 ++#split.wide=1 ++#output.horizontal.size=200 ++#output.vertical.size=60 ++#output.initial.hide=1 ++#horizontal.scrollbar=0 ++#horizontal.scroll.width=10000 ++#horizontal.scroll.width.tracking=0 ++#output.horizontal.scrollbar=0 ++#output.horizontal.scroll.width=10000 ++#output.horizontal.scroll.width.tracking=0 ++#output.scroll=0 ++#error.select.line=1 ++#end.at.last.line=0 ++tabbar.visible=1 ++#tabbar.hide.one=1 ++#tabbar.hide.index=1 ++#tabbar.multiline=1 ++#toolbar.visible=1 ++#toolbar.usestockicons=1 ++#toolbar.large=1 ++#menubar.detachable=1 ++#undo.redo.lazy=1 ++statusbar.visible=1 ++#fileselector.width=800 ++#fileselector.height=600 ++#fileselector.show.hidden=1 ++#magnification=-1 ++#output.magnification=-1 ++ ++#change.history=3 ++change.history=0 ++#~ indicator.reverted.to.origin.insertion=style:squiggle,colour:#40A0BF ++#~ indicator.reverted.to.origin.deletion=style:point,colour:#40A0BF ++#~ indicator.saved.insertion=style:squiggle,colour:#60A060 ++#~ indicator.saved.deletion=style:point,colour:#00A000 ++#~ indicator.modified.insertion=style:squiggle,colour:#A0A060 ++#~ indicator.modified.deletion=style:point,colour:#A0A000 ++#~ indicator.reverted.to.modified.insertion=style:squiggle,colour:#FF8000 ++#~ indicator.reverted.to.modified.deletion=style:point,colour:#FF8000 ++#~ marker.reverted.to.origin=style:leftrect,fore:#40A0BF,back:#40A0BF ++#~ marker.saved=style:leftrect,fore:#00A000,back:#00A000 ++#~ marker.modified=style:leftrect,fore:#A0A000,back:#A0A000 ++#~ marker.reverted.to.modified=style:leftrect,fore:#FF8000,back:#FF8000 ++ ++# Sizes and visibility in edit pane ++line.margin.visible=1 ++line.margin.width=4 ++margin.width=$(scale 16) ++fold.margin.width=$(scale 14) ++#fold.margin.colour=#FF0000 ++#fold.margin.highlight.colour=#0000FF ++#blank.margin.left=4 ++#blank.margin.right=4 ++#output.blank.margin.left=4 ++buffered.draw=1 ++#phases.draw=2 ++if PLAT_WIN ++ technology=1 ++#font.quality=3 ++#font.locale=zh-Hans ++if PLAT_MAC ++ font.quality=3 ++ ++# Element styles ++#view.eol=1 ++#control.char.symbol=. ++#representations=\x0D\x0A=\u20AA ++caret.period=500 ++view.whitespace=0 ++view.indentation.whitespace=1 ++view.indentation.guides=1 ++view.indentation.examine=3 ++highlight.indentation.guides=1 ++#caret.fore=#FF0000 ++#caret.additional.fore=#FF00DF ++#caret.additional.blinks=0 ++#caret.style=2 ++#caret.width=2 ++#caret.line.back=#FFFED83F ++#caret.line.layer=1 ++#caret.line.frame=1 ++edge.column=200 ++edge.mode=0 ++edge.colour=#C0DCC0 ++braces.check=1 ++braces.sloppy=1 ++#selection.fore=#006000 ++selection.layer=2 ++if PLAT_WINNT ++ selection.back=#00000020 ++if PLAT_GTK ++ selection.back=#0000001E ++ selection.secondary.back=#00800010 ++if PLAT_MAC ++ selection.back=#00000020 ++selection.additional.back=#00000010 ++selection.inactive.back=#00000010 ++#selection.additional.fore=#0000A0 ++#selection.inactive.fore=#00A000 ++#selection.secondary.fore=#A00000 ++selection.always.visible=1 ++#selection.rectangular.switch.mouse=1 ++#selection.multiple=0 ++#selection.additional.typing=0 ++#selection.multipaste=0 ++#virtual.space=3 ++#rectangular.selection.modifier=8 ++#whitespace.fore=#FF0000 ++#whitespace.back=#FFF0F0 ++#whitespace.size=2 ++#error.marker.fore=#0000A0 ++#error.marker.back=#DADAFF ++#error.inline=1 ++bookmark.fore=#BE0000 ++#bookmark.back=#FFFFA0 ++#bookmark.alpha= ++#bookmark.stroke.width=200 ++#bookmark.symbol=3 ++#find.mark=#0000FF ++#find.mark.indicator=style:compositionthick,colour:#FFB700,under ++#highlight.current.word=1 ++#highlight.current.word.by.style=1 ++#highlight.current.word.colour=#00D040 ++#highlight.current.word.indicator=style:roundbox,colour:#0080FF,under,outlinealpha:140,fillalpha:80 ++filter.match.indicator=style:compositionthick,colour:#FFB700,under ++#filter.match.back=#FFB00030 ++#filter.context=2 ++#hidden.line.colour=2 ++#indicators.alpha=63 ++#indicators.under=1 ++ ++# Scripting ++ext.lua.startup.script=$(SciteUserHome)/SciTEStartup.lua ++ext.lua.auto.reload=1 ++#ext.lua.reset=1 ++ ++# Checking ++are.you.sure=1 ++#are.you.sure.for.build=1 ++#save.all.for.build=1 ++#quit.on.close.last=1 ++#load.on.activate=1 ++#save.on.deactivate=1 ++#are.you.sure.on.reload=1 ++#save.on.timer=20 ++#reload.preserves.undo=1 ++#check.if.already.open=1 ++#temp.files.sync.load=1 ++default.file.ext=.cxx ++#source.default.extensions=.h|.cxx|.bat ++title.full.path=1 ++#title.show.buffers=1 ++#pathbar.visible=1 ++#pathbar.selectable=1 ++save.recent=1 ++save.session=1 ++#session.bookmarks=1 ++#session.folds=1 ++#save.position=1 ++#save.find=1 ++#open.dialog.in.file.directory=1 ++#strip.trailing.spaces=1 ++#ensure.final.line.end=1 ++#ensure.consistent.line.ends=1 ++#save.deletes.first=1 ++#save.check.modified.time=1 ++buffers=100 ++#buffers.zorder.switching=1 ++#api.*.cxx=d:\api\w.api ++#locale.properties=locale.de.properties ++#translation.missing=*** ++#read.only=1 ++#read.only.indicator=1 ++#background.open.size=20000 ++#background.save.size=20000 ++if PLAT_GTK ++ background.save.size=10000000 ++#max.file.size=1 ++file.size.large=100000000 ++file.size.no.styles=10000000 ++#lexilla.path=. ++ ++# Indentation ++tabsize=8 ++indent.size=8 ++use.tabs=1 ++#indent.auto=1 ++indent.automatic=1 ++indent.opening=0 ++indent.closing=0 ++#tab.indents=0 ++#backspace.unindents=0 ++ ++# Wrapping of long lines ++wrap=1 ++wrap.style= ++#cache.layout=3 ++#output.wrap=1 ++#output.cache.layout=3 ++threads.layout=16 ++#wrap.visual.flags=3 ++#wrap.visual.flags.location=3 ++#wrap.indent.mode=1 ++#wrap.visual.startindent=4 ++ ++#idle.styling=1 ++#output.idle.styling=1 ++ ++# Folding ++# enable folding, and show lines below when collapsed. ++fold=1 ++fold.compact=1 ++fold.flags=16 ++#fold.line.colour=#80800080 ++fold.symbols=1 ++#fold.fore=#000000 ++#fold.back=#808080 ++#fold.highlight=1 ++#fold.highlight.colour=#00C0C0 ++#fold.stroke.width=200 ++#fold.on.open=1 ++fold.comment=1 ++fold.preprocessor=1 ++ ++# Find and Replace ++# Internal search always available with recursive capability so use in preference to external tool ++find.command= ++# findstr is available on recent versions of Windows including 2000 ++#if PLAT_WIN ++# find.command=findstr /n /s $(find.what) $(find.files) ++#find.input=$(find.what) ++#if PLAT_GTK ++# find.command=grep --line-number "$(find.what)" $(find.files) ++find.files=*.c *.cxx *.h ++#find.in.files.close.on.find=0 ++#find.in.dot=1 ++#find.in.binary=1 ++#find.exclude=*.bak *.orig debug ++#find.in.directory= ++#find.close.on.find=0 ++#find.replace.matchcase=1 ++#find.replace.escapes=1 ++#find.replace.regexp=1 ++#find.replace.regexp.posix=1 ++#find.replace.regexp.cpp11=1 ++#find.replace.wrap=0 ++#find.replacewith.focus=0 ++#find.replace.advanced=1 ++find.use.strip=1 ++#find.strip.incremental=1 ++#find.indicator.incremental=style:compositionthick,colour:#FFB700,under ++replace.use.strip=1 ++#replace.strip.incremental=1 ++#strip.button.height=24 ++#strip.shortcuts.enable=0 ++ ++# Behaviour ++#eol.mode=LF ++eol.auto=1 ++clear.before.execute=0 ++#vc.home.key=1 ++#wrap.aware.home.end.keys=1 ++#autocompleteword.automatic=1 ++#autocomplete.choose.single=1 ++#autocomplete.*.fillups=([ ++#autocomplete.*.start.characters=.: ++#autocomplete.*.typesep=! ++#autocomplete.fore=#80FFA0 ++#autocomplete.back=#000000 ++#autocomplete.selected.fore=#00FF40 ++#autocomplete.selected.back=#006040 ++#autocomplete.visible.item.count=15 ++ ++caret.policy.xslop=1 ++caret.policy.width=20 ++caret.policy.xstrict=0 ++caret.policy.xeven=0 ++caret.policy.xjumps=0 ++caret.policy.yslop=1 ++caret.policy.lines=1 ++caret.policy.ystrict=1 ++caret.policy.yeven=1 ++caret.policy.yjumps=0 ++#visible.policy.strict=1 ++#visible.policy.slop=1 ++#visible.policy.lines=4 ++#time.commands=1 ++#caret.sticky=1 ++#properties.directory.enable=1 ++#editor.config.enable=1 ++#save.path.suggestion=$(SciteUserHome)\note_$(TimeStamp).txt ++ ++# Status Bar ++statusbar.number=4 ++statusbar.text.1=\ ++li=$(LineNumber) co=$(ColumnNumber) $(OverType) ($(EOLMode)) $(FileAttr) ++statusbar.text.2=\ ++$(BufferLength) chars in $(NbOfLines) lines. Sel: $(SelLength) chars. ++statusbar.text.3=\ ++Now is: Date=$(CurrentDate) Time=$(CurrentTime) ++statusbar.text.4=\ ++$(FileNameExt) : $(FileDate) - $(FileTime) | $(FileAttr) ++ ++if PLAT_WIN ++ command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html" ++ command.scite.help.subsystem=2 ++if PLAT_GTK ++ command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html" ++ ++# Internationalisation ++# Japanese input code page 932 and ShiftJIS character set 128 ++#code.page=932 ++#character.set=128 ++# Unicode ++code.page=65001 ++#character.set=204 ++#command.discover.properties=python /home/user/FileDetect.py "$(FilePath)" ++# Forward LC_CTYPE to setlocale which may affect language support. ++#LC_CTYPE=en_US.UTF-8 ++if PLAT_GTK ++ output.code.page=65001 ++if PLAT_MAC ++ output.code.page=65001 ++#ime.interaction=1 ++#ime.autocomplete=1 ++#accessibility=0 ++ ++# Export ++#export.keep.ext=1 ++export.html.wysiwyg=1 ++#export.html.tabs=1 ++#export.html.folding=1 ++export.html.styleused=1 ++#export.html.title.fullpath=1 ++#export.rtf.tabs=1 ++#export.rtf.font.face=Arial ++#export.rtf.font.size=9 ++#export.rtf.tabsize=8 ++#export.rtf.wysiwyg=0 ++#export.tex.title.fullpath=1 ++# Magnification (added to default screen font size) ++export.pdf.magnification=0 ++# Font: Courier, Helvetica or Times (Courier line-wraps) ++export.pdf.font=Helvetica ++# Page size (in points): width, height ++# E.g. Letter 612,792; A4 595,842; maximum 14400,14400 ++export.pdf.pagesize=595,842 ++# Margins (in points): left, right, top, bottom ++export.pdf.margins=72,72,72,72 ++export.xml.collapse.spaces=1 ++export.xml.collapse.lines=1 ++ ++# Define values for use in the imported properties files ++chars.alpha=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ++chars.numeric=0123456789 ++chars.accented=ŠšŒœŸÿÀàÁáÂâÃãÄäÅåÆæÇçÈèÉéÊêËëÌìÍíÎîÏïÐðÑñÒòÓóÔôÕõÖØøÙùÚúÛûÜüÝýÞþßö ++# This is a better set for Russian: ++#chars.accented=ÀàÁáÂâÃãÄäÅ娸ÆæÇçÈèÉéÊêËëÌìÍíÎîÏïÐðÑñÒòÓóÔôÕõÖö×÷ØøÙùÚúÛûÜüÝýÞþßÿ ++ ++# The open.filter setting is used in the file selector which has a menu of filters to apply ++# to the types of files seen when opening. ++ ++# Gather all settings with "*source.patterns." prefix from all active .properties files ++source.files=$(star *source.patterns.) ++source.all.filter=All Source|$(source.files)| ++ ++# Each platform has a different idea of the most important filters ++if PLAT_WIN ++ all.files=All Files (*.*)|*.*| ++ top.filters=$(source.all.filter)$(all.files) ++if PLAT_GTK ++ all.files=All Files (*)|*|Hidden Files (.*)|.*| ++ top.filters=$(all.files)$(source.all.filter) ++# As macOS only greys out filtered files, show all as default ++if PLAT_MAC ++ all.files=All Files (*.*)|*.*| ++ top.filters=$(all.files)$(source.all.filter) ++ ++# Gather all settings with "*filter." prefix from all active .properties files ++list.filters=$(star *filter.) ++ ++open.filter=$(top.filters)$(list.filters) ++ ++#save.filter=$(open.filter) ++ ++# Give symbolic names to the set of fonts used in the standard styles. ++if PLAT_WIN ++ font.base=font:Verdana,size:9.4 ++ font.small=font:Verdana,size:8 ++ font.comment=font:Georgia,size:10.1 ++ font.code.comment.box=$(font.comment) ++ font.code.comment.line=$(font.comment) ++ font.code.comment.doc=$(font.comment) ++ font.code.comment.nested=$(font.comment) ++ font.text=font:Times New Roman,size:11 ++ font.text.comment=font:Verdana,size:9 ++ font.embedded.base=font:Verdana,size:9 ++ font.embedded.comment=font:Comic Sans MS,size:8 ++ font.monospace=font:Consolas,size:8.9 ++ font.monospace.small=font:Consolas,size:8 ++ font.vbs=font:Candara,size:10 ++if PLAT_GTK ++ font.base=font:DejaVu Sans,size:9 ++ font.small=font:DejaVu Sans,size:8 ++ font.comment=font:DejaVu Serif,size:9 ++ font.code.comment.box=$(font.comment) ++ font.code.comment.line=$(font.comment) ++ font.code.comment.doc=$(font.comment) ++ font.code.comment.nested=$(font.comment) ++ font.text=font:DejaVu Serif,size:10 ++ font.text.comment=font:Serif,size:9 ++ font.embedded.base=font:Serif,size:9 ++ font.embedded.comment=font:Serif,size:9 ++ font.monospace=font:DejaVu Sans Mono,size:9 ++ font.monospace.small=font:DejaVu Sans Mono,size:8 ++ font.vbs=font:DejaVu Sans Mono,size:9 ++if PLAT_MAC ++ font.base=font:Verdana,size:12 ++ font.small=font:Verdana,size:10 ++ font.comment=font:Georgia,size:13 ++ font.code.comment.box=$(font.comment) ++ font.code.comment.line=$(font.comment) ++ font.code.comment.doc=$(font.comment) ++ font.code.comment.nested=$(font.comment) ++ font.text=font:Times New Roman,size:13 ++ font.text.comment=font:Verdana,size:11 ++ font.embedded.base=font:Verdana,size:11 ++ font.embedded.comment=font:Comic Sans MS,size:10 ++ font.monospace=font:Menlo,size:12 ++ font.monospace.small=font:Menlo,size:10 ++ font.vbs=font:Lucida Sans Unicode,size:12 ++font.js=$(font.comment) ++font.monospaced.list=Consolas;Courier New;DejaVu Sans Mono;Menlo ++ ++# Give symbolic names to the set of colours used in the standard styles. ++colour.code.comment.box=fore:#007F00 ++colour.code.comment.line=fore:#007F00 ++colour.code.comment.doc=fore:#3F703F ++colour.code.comment.nested=fore:#A0C0A0 ++colour.text.comment=fore:#0000FF,back:#D0F0D0 ++colour.other.comment=fore:#007F00 ++colour.embedded.comment=back:#E0EEFF ++colour.embedded.js=back:#F0F0FF ++colour.notused=back:#FF0000 ++ ++colour.number=fore:#007F7F ++colour.keyword=fore:#00007F ++colour.string=fore:#7F007F ++colour.char=fore:#7F007F ++colour.operator=fore:#000000 ++colour.preproc=fore:#7F7F00 ++colour.error=fore:#FFFF00,back:#FF0000 ++ ++# To de-emphasize inactive code set traits.inactive ++#traits.inactive=,back:#F0F0F0,eolfilled ++traits.inactive= ++ ++# Global default styles for all languages ++# Default ++style.*.32=$(font.base) ++# Line number ++style.*.33=back:#C0C0C0,$(font.base) ++# Brace highlight ++style.*.34=fore:#0000FF,bold ++# Brace incomplete highlight ++style.*.35=fore:#FF0000,bold ++# Control characters ++style.*.36= ++# Indentation guides ++style.*.37=fore:#C0C0C0,back:#FFFFFF ++ ++# Printing ++#print.colour.mode=1 ++print.magnification=-1 ++# Windows-only setup: left, right, top, bottom margins, in local units: ++# hundredths of millimeters or thousandths of inches ++print.margins=1500,1000,1000,1500 ++# Header/footer: ++print.header.format=$(FileNameExt) -- Printed on $(CurrentDate), $(CurrentTime) -- Page $(CurrentPage) ++print.footer.format=$(FilePath) -- File date: $(FileDate) -- File time: $(FileTime) ++# Header/footer style ++print.header.style=font:Arial,size:12,bold ++print.footer.style=font:Arial Narrow,size:10,italics ++ ++# Experimental undocumented settings ++#bidirectional=1 ++ ++# Warnings - only works on Windows and needs to be pointed at files on machine ++#if PLAT_WIN ++# warning.findwrapped=100,E:\Windows\Media\SFX\Boing.wav ++# warning.notfound=0,Effect.wav ++# warning.wrongfile=0,Glass.wav ++# warning.executeok=0,Fanfare.wav ++# warning.executeko=100,GlassBreak.wav ++# warning.nootherbookmark=100,Boing2.wav ++ ++#create.hidden.console=1 ++ ++# Define the Lexer menu, ++# Each item contains three parts: menu string | file extension | key ++# The only keys allowed currently are based on F-keys and alphabetic keys and look like ++# [Ctrl+][Shift+][Fn|a] such as F12 or Ctrl+Shift+D. ++# A '&' may be placed before a letter to be used as an accelerator. This does not work on GTK+. ++ ++keyText=Shift+F11 ++keyMake=Ctrl+Shift+F11 ++keyHTML=F12 ++keyXML=Shift+F12 ++keyIndent=Ctrl+Shift+F12 ++# On macOS, F11 is used by Expose, F12 by Dashbard ++if PLAT_MAC ++ os.x.home.end.keys=1 ++ keyText=Shift+F13 ++ keyMake=Ctrl+Shift+F13 ++ keyHTML=Ctrl+Shift+F14 ++ keyXML=Shift+F14 ++ keyIndent= ++ ++# Gather all settings with "*language." prefix from all active .properties files ++menu.language=$(star *language.) ++ ++# User defined key commands ++user.shortcuts=\ ++Ctrl+Shift+V|IDM_PASTEANDDOWN|\ ++Ctrl+PageUp|IDM_PREVFILE|\ ++Ctrl+PageDown|IDM_NEXTFILE| ++ ++#KeypadPlus|IDM_EXPAND|\ ++#KeypadMinus|IDM_BLOCK_COMMENT| ++ ++#user.context.menu=\ ++#||\ ++#Next File|IDM_NEXTFILE|\ ++#Prev File|IDM_PREVFILE| ++ ++# To keep menus short, these .properties files are not loaded by default. ++imports.exclude=abaqus abbrev ada asl asn1 ave avs baan blitzbasic \ ++bullant caml cil cmake cobol coffeescript csound d dataflex ecl eiffel \ ++Embedded erlang escript flagship forth fortran freebasic fsharp gap \ ++haskell hex kix latex lisp lot lout matlab maxima metapost mmixal \ ++modula3 nim nimrod opal oscript pascal pov powerpro ps purebasic r raku \ ++rebol ruby sas scriptol smalltalk sorcins specman spice tacl tal tex \ ++txt2tags verilog vhdl visualprolog ++# The set of imports allowed can be set with ++#imports.include=ave ++ ++ext.lua.startup.script=$(SciteDefaultHome)/stackrpms.lua ++command.name.8.*=Emit &UTF8 Unicode ++command.subsystem.8.*=3 ++command.8.*=emitUnicode ++command.mode.8.*=savebefore:no ++command.shortcut.8.*=Ctrl+U ++command.name.9.*=Insert &Date AH ++command.subsystem.9.*=3 ++command.9.*=InsertDateAH ++command.mode.9.*=savebefore:no ++command.shortcut.9.*=F5 ++command.name.10.*=Insert Date iso8601 ++command.subsystem.10.*=3 ++command.10.*=InsertDateIso ++command.mode.10.*=savebefore:no ++command.shortcut.10.*=Shift+F5 ++ ++# Import all the language specific properties files in this directory ++import * ++ ++# bgstack15 improvements, in addition to a few sprinkled above. ++font.base=$(font.monospace) ++font.small=$(font.monospace) ++font.comment=$(font.monospace) ++font.text=$(font.monospace) ++font.text.comment=$(font.monospace) ++font.embedded.base=$(font.monospace) ++font.embedded.comment=$(font.monospace) ++font.vbs=$(font.monospace) +diff -x '.*.swp' -Naur salsa/scite/debian/scite+stackrpms.dsc stackrpms/scite/debian/scite+stackrpms.dsc +--- salsa/scite/debian/scite+stackrpms.dsc 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/scite+stackrpms.dsc 2024-08-01 10:59:57.025637267 -0400 +@@ -0,0 +1,17 @@ ++Format: 3.0 (quilt) ++Source: scite ++Binary: scite ++Architecture: any ++Version: 1:5.5.1-101+stackrpms ++Maintainer: B. Stack <bgstack15@gmail.com> ++Homepage: https://scintilla.org/SciTE.html ++Standards-Version: 4.7.0 ++Vcs-Browser: https://salsa.debian.org/debian/scite ++Vcs-Git: https://salsa.debian.org/debian/scite.git ++Build-Depends: debhelper-compat (= 13), libgtk-3-dev, libglib2.0-dev, liblua5.4-dev ++Package-List: ++ scite deb editors optional arch=any ++Files: ++ 00000000000000000000000000000000 1 scite.orig.tar.gz ++ 00000000000000000000000000000000 1 scite+stackrpms.debian.tar.xz ++Original-Maintainer: Michael Vogt <mvo@debian.org> +diff -x '.*.swp' -Naur salsa/scite/debian/_service stackrpms/scite/debian/_service +--- salsa/scite/debian/_service 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/_service 2024-08-01 10:59:53.701637267 -0400 +@@ -0,0 +1,24 @@ ++<services> ++ <service name="tar_scm"> ++ <param name="scm">git</param> ++ <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param> ++ <param name="subdir">scite/debian</param> ++ <param name="filename">debian</param> ++ <param name="revision">master</param> ++ <param name="version">_none_</param> ++ </service> ++ <service name="recompress"> ++ <param name="file">*.tar</param> ++ <param name="compression">xz</param> ++ </service> ++ <service name="download_url"> ++ <param name="protocol">https</param> ++ <param name="host">www.scintilla.org</param> ++ <param name="path">scite551.tgz</param> ++ <param name="filename">scite_5.5.1.orig.tar.gz</param> ++ </service> ++ <service name="extract_file"> ++ <param name="archive">*.tar.xz</param> ++ <param name="files">*/*.dsc</param> ++ </service> ++</services> +diff -x '.*.swp' -Naur salsa/scite/debian/source/lintian-overrides stackrpms/scite/debian/source/lintian-overrides +--- salsa/scite/debian/source/lintian-overrides 2024-05-01 20:16:52.117804014 -0400 ++++ stackrpms/scite/debian/source/lintian-overrides 2024-05-01 20:27:00.470504688 -0400 +@@ -3,3 +3,7 @@ + scite source: source-is-missing [scite/doc/ScriptLexer.html] + scite source: source-is-missing [scintilla/doc/SciCoding.html] + scite source: source-is-missing [lexilla/test/examples/hypertext/mako.html] ++# stackrpms,4 ++national-encoding debian/SciTEGlobal.properties ++invalid-field-for-derivative ++invalid-devuan-version +diff -x '.*.swp' -Naur salsa/scite/debian/stackrpms.lua stackrpms/scite/debian/stackrpms.lua +--- salsa/scite/debian/stackrpms.lua 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/stackrpms.lua 2024-07-20 09:10:34.708207055 -0400 +@@ -0,0 +1,279 @@ ++-- DESCRIPTION: ++-- Unicode hexadecimal table: https://example.com/copied/unicode.html ++-- Source: http://lua-users.org/wiki/SciteUnicodeInput http://sourceforge.net/projects/emitunicodeinscite/ ++-- Future reference: http://lua-users.org/wiki/SciteScripts ++-- ++-- This lua script adds utf8 unicode input, to the scite text editor. ++-- ++-- The scite text editor should be set to use the UTF-8 encoding ++-- , because this script adds utf8, into the text buffer of the ++-- scite editor. Select File->Encoding->UTF-8, from the ++-- menu bar of scite. ++-- ++-- For example, it will be possible that you type 2200 CTRL+U ++-- , and 2200 is replaced to ∀; (U+2200), in the scite editor. ++-- ++-- ______________________________________________________________________________ ++-- ++-- INSTALL: ++-- ++-- To have scite running this script each time you press Ctrl+U, add next lines ++-- into your ~/SciTEUser.properties file, where ~ is your home directory. ++-- FILE ~/SciTEUser.properties: ++--[[ ++ext.lua.startup.script=$(SciteUserHome)/emitUtf8UnicodeIntoTheSciteEditor.lua ++command.name.8.*=Emit UTF8 Unicode ++command.subsystem.8.*=3 ++command.8.*=emitUtf8UnicodeIntoTheSciteEditor ++command.mode.8.*=savebefore:no ++command.shortcut.8.*=Ctrl+U ++--]] ++-- ______________________________________________________________________________ ++-- THE LUA CODE: ++-- ++-- Next is the definition of the lua function that is called by scite ++-- when CTRL+U is pressed, to replace unicode endpoint encoding, with ++-- utf8 encoding of the unicode endpoint. ++-- ______________________________________________________________________________ ++ ++ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0 <= u <= 0x7f ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case1UnicodeToUtf8(unicodeValue) ++ --print('case 1') ++ local u = unicodeValue ++ local byte0 = (u % 0x80) ++ local utf8 = string.char(byte0) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0x80 <= u <= 0x7ff ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case2UnicodeToUtf8(unicodeValue) ++ --print('case 2') ++ local u = unicodeValue ++ local byte1 = (0x80 + (u % 0x40) ) ++ u = math.floor(u / 0x40) ++ local byte0 = (0xc0 + (u % 0x20) ) ++ local utf8 = string.char(byte0, byte1) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0x800 <= u <= 0xffff. ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case3UnicodeToUtf8(unicodeValue) ++ local u = unicodeValue ++ local byte2 = (0x80 + (u % 0x40)) ++ -- print('byte2: '..byte2) ++ u = math.floor(u / 0x40) ++ local byte1 = (0x80 + (u % 0x40)) ++ -- print('byte1: '..byte1) ++ u = math.floor(u / 0x40) ++ local byte0 = (0xe0 + (u % 0x10)) ++ -- print('byte0: '..byte0) ++ local utf8 = string.char(byte0, byte1, byte2) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0x10000 <= u <= 0x10ffff. ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case4UnicodeToUtf8(unicodeValue) ++ local u = unicodeValue ++ local byte3 = (0x80 + (u % 0x40)) ++ u = math.floor(u / 0x40) ++ local byte2 = (0x80 + (u % 0x40)) ++ u = math.floor(u / 0x40) ++ local byte1 = (0x80 + (u % 0x40)) ++ u = math.floor(u / 0x40) ++ local byte0 = (0xf0 + (u % 0x8)) ++ local utf8 = string.char(byte0, byte1, byte2, byte3) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Converts a unicode integer value, into a utf8 string value. ++-- ++-- The unicode integer value is an integer that ++-- is greater than or equal to zero. ++-- ++-- The utf8 string value is a string that is a sequence of ++-- 8 bits characters that give the utf8 encoding of the ++-- unicode codepoint given by the unicode integer value. ++-- ++-- @param unicodeValue the unicode integer value; ++-- a unicode codepoint ++-- ++-- @return the utf8 encoding of the unicode codepoint ++-- provided by the unicodeValue input argument ++function unicodeToUtf8(unicodeValue) ++ local u = unicodeValue ++ if ((0x800 <= u) and (0xffff >= u)) ++ then ++ return case3UnicodeToUtf8(u) ++ end ++ if ((0x80 <= u) and (0x7fff >= u)) ++ then ++ return case2UnicodeToUtf8(u) ++ end ++ if ((0x0 <= u) and (0x7f >= u)) ++ then ++ return case1UnicodeToUtf8(u) ++ end ++ if( (0x10000 <= u) and (0x10ffff >= u) ) ++ then ++ return case4UnicodeToUtf8(u) ++ end ++ return nil ++end ++ ++-- ______________________________________________________________________________ ++-- Peeks (reads) the character at position i, in the Scite Editor. ++-- If the character is the ascii name of a hex digit, it returns ++-- the corresponding hex digit, otherwise it returns nil. ++-- ++-- @param i position in the Scite Editor ++-- @return hex digit at position i, or nil ++function peekHexdigit(i) ++ local e = editor ++ local asciiCode = e.CharAt[i] ++ if((0>asciiCode) or (0xff < asciiCode)) ++ then ++ return nil ++ end ++ local charValue = string.char(asciiCode) ++ local hexDigit = tonumber(charValue,0x10) ++ return hexDigit -- may be nil ++end ++ ++-- ______________________________________________________________________________ ++-- Reads the sequence of maximum length at most 5, at the left of the cursor ++-- in the Scite Editor. ++-- Encodes the longest suffix of this sequence, that is a hex number, into ++-- the utf encoding of this hex number. ++-- Replaces this longest suffix, with the utf8 sequence. ++-- ++-- @return true a suffix of length greater than zero, at most 5 existed ++-- and was replaced with the utf8 encoding of the number it ++-- represented ++-- ++-- false , when no such suffix existed ++function emitUtf8Unicode() ++ local e = editor ++ local n = e.TextLength ++ local i = e.CurrentPos ++ local maxlen = 5 ++ if ((0 == n) or (1 > i)) ++ then ++ return nil -- Success. No request ++ end ++ local len = 1 ++ local len2 = 0 ++ local u = 0 ++ local thePower = 1 ++ while ( (len <= maxlen) ++ and (0 <= (i - len) ) ++ ) ++ do ++ local hexDigit = peekHexdigit(i-len,u) ++ if (nil == hexDigit) ++ then ++ break -- out of the while loop ++ end ++ u = ( u + (thePower * hexDigit) ) ++ thePower = (0x10 * thePower ) ++ len2 = len ++ --print("u: "..u) ++ len = len + 1 ++ end ++ if (0 == len2) ++ then ++ return nil -- Failure. No unicode ++ end ++ utf8 = unicodeToUtf8(u) ++ if(nil == utf8) ++ then ++ return nil -- Failure. Unicode to utf8 conversion failed. ++ end ++ e:SetSel(i-len2,i) ++ e:ReplaceSel(utf8) ++ --print("utf8: "..utf8) ++ return true -- Success. ++end ++ ++-- ______________________________________________________________________________ ++-- Emits utf8 encoding in the place of the unicode codepoint ++-- in the editor, at the left of the cursor. ++-- ++-- Writes a message to the Output pane, if no codepoint existed ++-- at the left of the cursor. ++-- ++function emitUnicode() ++ local ok = emitUtf8Unicode() ++ if not ok ++ then ++ --print("Failed to encode unicode into text editor.") ++ end ++end ++ ++-- ______________________________________________________________________________ ++-- ++-- Following web pages were useful in writing the lua scite script. ++-- ++-- http://lua-users.org/wiki/UsingLuaWithScite ++-- http://www.scintilla.org/PaneAPI.html ++-- http://www.lua.org/manual/5.1/manual.html#pdf-tonumber ++-- https://en.wikipedia.org/wiki/UTF-8 ++-- ++-- http://lua-users.org/lists/lua-l/2007-08/msg00276.html ++-- http://keplerproject.github.io/luadoc/ ++ ++-- Reference: http://lua-users.org/wiki/SciteInsertDate ++-- Tags used by os.date: ++-- %a abbreviated weekday name (e.g., Wed) ++-- %A full weekday name (e.g., Wednesday) ++-- %b abbreviated month name (e.g., Sep) ++-- %B full month name (e.g., September) ++-- %c date and time (e.g., 09/16/98 23:48:10) ++-- %d day of the month (16) [01-31] ++-- %H hour, using a 24-hour clock (23) [00-23] ++-- %I hour, using a 12-hour clock (11) [01-12] ++-- %M minute (48) [00-59] ++-- %m month (09) [01-12] ++-- %p either "am" or "pm" (pm) ++-- %S second (10) [00-61] ++-- %w weekday (3) [0-6 = Sunday-Saturday] ++-- %x date (e.g., 09/16/98) ++-- %X time (e.g., 23:48:10) ++-- %Y full year (1998) ++-- %y two-digit year (98) [00-99] ++-- %% the character '%' ++-- Last modified 2024-07-20-7 09:10 ++function InsertDateAH() ++ local dow = tostring(math.floor(os.date("%w") + 1)) ++ local d1 = os.date("%Y-%m-%d-") ++ local d2 = os.date(" %H:%M") ++ editor:ReplaceSel(d1..dow..d2) ++end ++function InsertDateIso() ++ local date_string = os.date("%Y-%m-%dT%T") ++ editor:ReplaceSel(date_string) ++end diff --git a/scite/stackrpms-5.5.2-1.diff b/scite/stackrpms-5.5.2-1.diff new file mode 100644 index 0000000..28fff6f --- /dev/null +++ b/scite/stackrpms-5.5.2-1.diff @@ -0,0 +1,1212 @@ +diff -x '.*.swp' -Naur salsa/scite/debian/changelog stackrpms/scite/debian/changelog +--- salsa/scite/debian/changelog 2024-08-23 09:35:02.985637267 -0400 ++++ stackrpms/scite/debian/changelog 2024-08-23 09:40:49.437637267 -0400 +@@ -1,3 +1,11 @@ ++scite (1:5.5.2-100+stackrpms) unstable; urgency=medium ++ ++ * Add stackrpms lua script and customized global.properties ++ * Use lua 5.4.4 ++ * Add epoch so stackrpms scite always has precedence over base package ++ ++ -- B. Stack <bgstack15@gmail.com> Fri, 23 Aug 2024 09:41:08 -0400 ++ + scite (5.5.2-1) unstable; urgency=medium + + * New upstream version 5.5.2 +diff -x '.*.swp' -Naur salsa/scite/debian/control stackrpms/scite/debian/control +--- salsa/scite/debian/control 2024-05-01 20:16:52.117804014 -0400 ++++ stackrpms/scite/debian/control 2024-05-01 20:24:05.262846855 -0400 +@@ -1,14 +1,13 @@ + Source: scite +-Maintainer: Michael Vogt <mvo@debian.org> +-Uploaders: Antonio Valentino <antonio.valentino@tiscali.it>, +- Andreas Rönnquist <gusnan@debian.org> ++Maintainer: B. Stack <bgstack15@gmail.com> ++XSBC-Original-Maintainer: Michael Vogt <mvo@debian.org> + Section: editors + Priority: optional + Rules-Requires-Root: no + Build-Depends: debhelper-compat (= 13), + libgtk-3-dev, + libglib2.0-dev, +- liblua5.3-dev ++ liblua5.4-dev + Standards-Version: 4.7.0 + Vcs-Browser: https://salsa.debian.org/debian/scite + Vcs-Git: https://salsa.debian.org/debian/scite.git +diff -x '.*.swp' -Naur salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch +--- salsa/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2023-12-30 15:10:24.740185203 -0500 ++++ stackrpms/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch 2024-04-04 08:23:08.596651801 -0400 +@@ -36,9 +36,9 @@ + -# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. + -CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) + -CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) +-+# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is. +-+CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.3) +-+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.3) +++# stackrpms,3 For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is. +++CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua5.4) +++CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.4) + gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null) + ifndef prefix + ifdef gnomeprefix +diff -x '.*.swp' -Naur salsa/scite/debian/patches/series stackrpms/scite/debian/patches/series +--- salsa/scite/debian/patches/series 2023-12-04 15:32:55.372321741 -0500 ++++ stackrpms/scite/debian/patches/series 2024-04-04 08:23:08.596651801 -0400 +@@ -2,3 +2,4 @@ + 0002-reproducible_build.patch + 0003-scite-desktop.patch + 0004-Build-with-Debian-packaged-Lua.patch ++use-lua5.4.4.patch +diff -x '.*.swp' -Naur salsa/scite/debian/patches/use-lua5.4.4.patch stackrpms/scite/debian/patches/use-lua5.4.4.patch +--- salsa/scite/debian/patches/use-lua5.4.4.patch 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/patches/use-lua5.4.4.patch 2023-08-19 17:16:15.202653929 -0400 +@@ -0,0 +1,191 @@ ++Name: Patch scite to use distro package of lua, Devuan ++Version: 5.2.3 ++Lua-Version: 5.4.4 ++Author: bgstack15@gmail.com ++Date-Modified: 2022-05-31 ++Message: Generated with the following command ++ ++ sed -r -e 's/checkint\(/checkinteger\(/g;' -e 's/lua_strlen\(/lua_rawlen\(/g;' scite/src/LuaExtension.cxx > ~/LuaExtension.cxx.new ++diff -aur scite/gtk/deps.mak scite/gtk/deps.mak ++--- a/scite/gtk/deps.mak 2022-03-30 20:48:24.000000000 -0400 +++++ b/scite/gtk/deps.mak 2022-04-04 14:47:39.110529717 -0400 ++@@ -469,13 +469,6 @@ ++ ../lua/src/luaconf.h \ ++ ../lua/src/lauxlib.h \ ++ ../lua/src/lualib.h ++-lbitlib.o: \ ++- ../lua/src/lbitlib.c \ ++- ../lua/src/lprefix.h \ ++- ../lua/src/lua.h \ ++- ../lua/src/luaconf.h \ ++- ../lua/src/lauxlib.h \ ++- ../lua/src/lualib.h ++ lcode.o: \ ++ ../lua/src/lcode.c \ ++ ../lua/src/lprefix.h \ ++diff -aur scite/src/LuaExtension.cxx scite/src/LuaExtension.cxx ++--- a/scite/src/LuaExtension.cxx 2022-03-30 20:48:24.000000000 -0400 +++++ b/scite/src/LuaExtension.cxx 2022-04-04 14:46:35.097978533 -0400 ++@@ -238,7 +238,7 @@ ++ ++ constexpr int paneIndex = lua_upvalueindex(1); ++ check_pane_object(L, paneIndex); ++- const int message = luaL_checkint(L, 1); +++ const int message = luaL_checkinteger(L, 1); ++ ++ lua_pushvalue(L, paneIndex); ++ lua_replace(L, 1); ++@@ -277,7 +277,7 @@ ++ } ++ ++ int cf_scite_constname(lua_State *L) { ++- const int message = luaL_checkint(L, 1); +++ const int message = luaL_checkinteger(L, 1); ++ const char *prefix = luaL_optstring(L, 2, nullptr); ++ const std::string constName = IFaceTable::GetConstantName(message, prefix); ++ if (constName.length() > 0) { ++@@ -308,7 +308,7 @@ ++ } ++ ++ int cf_scite_menu_command(lua_State *L) { ++- const int cmdID = luaL_checkint(L, 1); +++ const int cmdID = luaL_checkinteger(L, 1); ++ if (cmdID) { ++ host->DoMenuCommand(cmdID); ++ } ++@@ -330,7 +330,7 @@ ++ } ++ ++ int cf_scite_strip_set(lua_State *L) { ++- const int control = luaL_checkint(L, 1); +++ const int control = luaL_checkinteger(L, 1); ++ const char *value = luaL_checkstring(L, 2); ++ if (value) { ++ host->UserStripSet(control, value); ++@@ -339,7 +339,7 @@ ++ } ++ ++ int cf_scite_strip_set_list(lua_State *L) { ++- const int control = luaL_checkint(L, 1); +++ const int control = luaL_checkinteger(L, 1); ++ const char *value = luaL_checkstring(L, 2); ++ if (value) { ++ host->UserStripSetList(control, value); ++@@ -348,7 +348,7 @@ ++ } ++ ++ int cf_scite_strip_value(lua_State *L) { ++- const int control = luaL_checkint(L, 1); +++ const int control = luaL_checkinteger(L, 1); ++ std::string value = host->UserStripValue(control); ++ push_string(L, value); ++ return 1; ++@@ -438,7 +438,7 @@ ++ SA::Position rangeStart = 0; ++ SA::Position rangeEnd = 0; ++ ++- const int flags = (nArgs > 2) ? luaL_checkint(L, 3) : 0; +++ const int flags = (nArgs > 2) ? luaL_checkinteger(L, 3) : 0; ++ hasError = (flags == 0 && lua_gettop(L) > nArgs); ++ ++ if (!hasError) { ++@@ -515,7 +515,7 @@ ++ ++ SA::ScintillaCall &sc = host->PaneCaller(pmo->pane); ++ sc.SetTarget(pmo->range); ++- sc.ReplaceTarget(lua_strlen(L, 2), replacement); +++ sc.ReplaceTarget(lua_rawlen(L, 2), replacement); ++ pmo->range.end = sc.TargetEnd(); ++ return 0; ++ } ++@@ -601,7 +601,7 @@ ++ pmo->endPosOrig = 0; ++ pmo->flags = 0; ++ if (nargs >= 3) { ++- pmo->flags = luaL_checkint(L, 3); +++ pmo->flags = luaL_checkinteger(L, 3); ++ if (nargs >= 4) { ++ pmo->range.end = pmo->endPosOrig = luaL_checkinteger(L, 4); ++ if (pmo->range.end < 0) { ++@@ -766,7 +766,7 @@ ++ const int nargs = lua_gettop(L); ++ const char *code = luaL_checkstring(L, 1); ++ const char *name = luaL_optstring(L, 2, code); ++- if (0 == luaL_loadbuffer(L, code, lua_strlen(L, 1), name)) { +++ if (0 == luaL_loadbuffer(L, code, lua_rawlen(L, 1), name)) { ++ lua_call(L, 0, LUA_MULTRET); ++ return lua_gettop(L) - nargs; ++ } else { ++@@ -897,7 +897,7 @@ ++ int loopParamCount = 2; ++ ++ if (func.paramType[0] == iface_length && func.paramType[1] == iface_string) { ++- params[0] = lua_strlen(L, arg); +++ params[0] = lua_rawlen(L, arg); ++ params[1] = SptrFromString(params[0] ? lua_tostring(L, arg) : ""); ++ loopParamCount = 0; ++ } else if ((func.paramType[1] == iface_stringresult) || (func.returnType == iface_stringresult)) { ++@@ -916,8 +916,8 @@ ++ const char *s = lua_tostring(L, arg++); ++ params[i] = SptrFromString(s ? s : ""); ++ } else if (func.paramType[i] == iface_keymod) { ++- const int keycode = luaL_checkint(L, arg++) & 0xFFFF; ++- const intptr_t modifiers = luaL_checkint(L, arg++) & +++ const int keycode = luaL_checkinteger(L, arg++) & 0xFFFF; +++ const intptr_t modifiers = luaL_checkinteger(L, arg++) & ++ static_cast<int>(SA::KeyMod::Shift|SA::KeyMod::Ctrl|SA::KeyMod::Alt); ++ params[i] = keycode | (modifiers<<16); ++ } else if (func.paramType[i] == iface_bool) { ++@@ -1787,7 +1787,7 @@ ++ static int SetLevelAt(lua_State *L) { ++ StylingContext *context = Context(L); ++ const SA::Line line = luaL_checkinteger(L, 2); ++- const int level = luaL_checkint(L, 3); +++ const int level = luaL_checkinteger(L, 3); ++ context->styler->SetLevel(line, static_cast<SA::FoldLevel>(level)); ++ return 0; ++ } ++@@ -1802,7 +1802,7 @@ ++ static int SetLineState(lua_State *L) { ++ StylingContext *context = Context(L); ++ const SA::Line line = luaL_checkinteger(L, 2); ++- const int stateOfLine = luaL_checkint(L, 3); +++ const int stateOfLine = luaL_checkinteger(L, 3); ++ context->styler->SetLineState(line, stateOfLine); ++ return 0; ++ } ++@@ -1880,7 +1880,7 @@ ++ StylingContext *context = Context(L); ++ const SA::Position startPosStyle = luaL_checkinteger(L, 2); ++ const SA::Position lengthStyle = luaL_checkinteger(L, 3); ++- const int initialStyle = luaL_checkint(L, 4); +++ const int initialStyle = luaL_checkinteger(L, 4); ++ context->StartStyling(startPosStyle, lengthStyle, initialStyle); ++ return 0; ++ } ++@@ -1939,7 +1939,7 @@ ++ static int SetState(lua_State *L) { ++ StylingContext *context = Context(L); ++ context->Colourize(); ++- context->state = luaL_checkint(L, 2); +++ context->state = luaL_checkinteger(L, 2); ++ return 0; ++ } ++ ++@@ -1947,13 +1947,13 @@ ++ StylingContext *context = Context(L); ++ context->Forward(); ++ context->Colourize(); ++- context->state = luaL_checkint(L, 2); +++ context->state = luaL_checkinteger(L, 2); ++ return 0; ++ } ++ ++ static int ChangeState(lua_State *L) { ++ StylingContext *context = Context(L); ++- context->state = luaL_checkint(L, 2); +++ context->state = luaL_checkinteger(L, 2); ++ return 0; ++ } ++ ++ +diff -x '.*.swp' -Naur salsa/scite/debian/rules stackrpms/scite/debian/rules +--- salsa/scite/debian/rules 2023-07-31 11:35:56.033600691 -0400 ++++ stackrpms/scite/debian/rules 2024-04-04 08:23:08.596651801 -0400 +@@ -43,6 +43,9 @@ + mv -f $(CURDIR)/debian/scite/usr/share/scite/*.txt $(CURDIR)/debian/scite/usr/share/doc/scite/ + mv -f $(CURDIR)/debian/scite/usr/share/scite/*.jpg $(CURDIR)/debian/scite/usr/share/doc/scite/ + mv -f $(CURDIR)/debian/scite/usr/share/scite/*.png $(CURDIR)/debian/scite/usr/share/doc/scite/ ++ @#stackrpms,3 ++ cp -p debian/stackrpms.lua $(CURDIR)/debian/scite/usr/share/scite/ ++ install -D -p -m0666 debian/SciTEGlobal.properties $(CURDIR)/debian/scite/etc/scite/ + for f in $(CURDIR)/debian/scite/usr/share/doc/scite/*.html; do \ + dh_link usr/share/doc/scite/$$(basename $$f) usr/share/scite/$$(basename $$f); \ + done +diff -x '.*.swp' -Naur salsa/scite/debian/SciTEGlobal.properties stackrpms/scite/debian/SciTEGlobal.properties +--- salsa/scite/debian/SciTEGlobal.properties 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/SciTEGlobal.properties 2024-04-04 08:23:08.592651755 -0400 +@@ -0,0 +1,597 @@ ++# SciTEGlobal.properties placed by scite package for stackrpms ++# Global initialisation file for SciTE ++# For Linux, place in $prefix/share/scite ++# For Windows, place in same directory as SciTE.EXE (or Sc1.EXE) ++# Documentation at http://www.scintilla.org/SciTEDoc.html ++ ++# Globals ++ ++# Window sizes and visibility ++if PLAT_WIN ++ position.left=0 ++ position.top=0 ++if PLAT_GTK ++ position.left=5 ++ position.top=22 ++position.width=$(scale 576) ++position.height=$(scale 740) ++#position.maximize=1 ++#position.tile=1 ++#full.screen.hides.menu=1 ++#minimize.to.tray=1 ++split.vertical=0 ++#split.wide=1 ++#output.horizontal.size=200 ++#output.vertical.size=60 ++#output.initial.hide=1 ++#horizontal.scrollbar=0 ++#horizontal.scroll.width=10000 ++#horizontal.scroll.width.tracking=0 ++#output.horizontal.scrollbar=0 ++#output.horizontal.scroll.width=10000 ++#output.horizontal.scroll.width.tracking=0 ++#output.scroll=0 ++#error.select.line=1 ++#end.at.last.line=0 ++tabbar.visible=1 ++#tabbar.hide.one=1 ++#tabbar.hide.index=1 ++#tabbar.multiline=1 ++#toolbar.visible=1 ++#toolbar.usestockicons=1 ++#toolbar.large=1 ++#menubar.detachable=1 ++#undo.redo.lazy=1 ++statusbar.visible=1 ++#fileselector.width=800 ++#fileselector.height=600 ++#fileselector.show.hidden=1 ++#magnification=-1 ++#output.magnification=-1 ++ ++#change.history=3 ++change.history=0 ++#~ indicator.reverted.to.origin.insertion=style:squiggle,colour:#40A0BF ++#~ indicator.reverted.to.origin.deletion=style:point,colour:#40A0BF ++#~ indicator.saved.insertion=style:squiggle,colour:#60A060 ++#~ indicator.saved.deletion=style:point,colour:#00A000 ++#~ indicator.modified.insertion=style:squiggle,colour:#A0A060 ++#~ indicator.modified.deletion=style:point,colour:#A0A000 ++#~ indicator.reverted.to.modified.insertion=style:squiggle,colour:#FF8000 ++#~ indicator.reverted.to.modified.deletion=style:point,colour:#FF8000 ++#~ marker.reverted.to.origin=style:leftrect,fore:#40A0BF,back:#40A0BF ++#~ marker.saved=style:leftrect,fore:#00A000,back:#00A000 ++#~ marker.modified=style:leftrect,fore:#A0A000,back:#A0A000 ++#~ marker.reverted.to.modified=style:leftrect,fore:#FF8000,back:#FF8000 ++ ++# Sizes and visibility in edit pane ++line.margin.visible=1 ++line.margin.width=4 ++margin.width=$(scale 16) ++fold.margin.width=$(scale 14) ++#fold.margin.colour=#FF0000 ++#fold.margin.highlight.colour=#0000FF ++#blank.margin.left=4 ++#blank.margin.right=4 ++#output.blank.margin.left=4 ++buffered.draw=1 ++#phases.draw=2 ++if PLAT_WIN ++ technology=1 ++#font.quality=3 ++#font.locale=zh-Hans ++if PLAT_MAC ++ font.quality=3 ++ ++# Element styles ++#view.eol=1 ++#control.char.symbol=. ++#representations=\x0D\x0A=\u20AA ++caret.period=500 ++view.whitespace=0 ++view.indentation.whitespace=1 ++view.indentation.guides=1 ++view.indentation.examine=3 ++highlight.indentation.guides=1 ++#caret.fore=#FF0000 ++#caret.additional.fore=#FF00DF ++#caret.additional.blinks=0 ++#caret.style=2 ++#caret.width=2 ++#caret.line.back=#FFFED83F ++#caret.line.layer=1 ++#caret.line.frame=1 ++edge.column=200 ++edge.mode=0 ++edge.colour=#C0DCC0 ++braces.check=1 ++braces.sloppy=1 ++#selection.fore=#006000 ++selection.layer=2 ++if PLAT_WINNT ++ selection.back=#00000020 ++if PLAT_GTK ++ selection.back=#0000001E ++ selection.secondary.back=#00800010 ++if PLAT_MAC ++ selection.back=#00000020 ++selection.additional.back=#00000010 ++selection.inactive.back=#00000010 ++#selection.additional.fore=#0000A0 ++#selection.inactive.fore=#00A000 ++#selection.secondary.fore=#A00000 ++selection.always.visible=1 ++#selection.rectangular.switch.mouse=1 ++#selection.multiple=0 ++#selection.additional.typing=0 ++#selection.multipaste=0 ++#virtual.space=3 ++#rectangular.selection.modifier=8 ++#whitespace.fore=#FF0000 ++#whitespace.back=#FFF0F0 ++#whitespace.size=2 ++#error.marker.fore=#0000A0 ++#error.marker.back=#DADAFF ++#error.inline=1 ++bookmark.fore=#BE0000 ++#bookmark.back=#FFFFA0 ++#bookmark.alpha= ++#bookmark.stroke.width=200 ++#bookmark.symbol=3 ++#find.mark=#0000FF ++#find.mark.indicator=style:compositionthick,colour:#FFB700,under ++#highlight.current.word=1 ++#highlight.current.word.by.style=1 ++#highlight.current.word.colour=#00D040 ++#highlight.current.word.indicator=style:roundbox,colour:#0080FF,under,outlinealpha:140,fillalpha:80 ++filter.match.indicator=style:compositionthick,colour:#FFB700,under ++#filter.match.back=#FFB00030 ++#filter.context=2 ++#hidden.line.colour=2 ++#indicators.alpha=63 ++#indicators.under=1 ++ ++# Scripting ++ext.lua.startup.script=$(SciteUserHome)/SciTEStartup.lua ++ext.lua.auto.reload=1 ++#ext.lua.reset=1 ++ ++# Checking ++are.you.sure=1 ++#are.you.sure.for.build=1 ++#save.all.for.build=1 ++#quit.on.close.last=1 ++#load.on.activate=1 ++#save.on.deactivate=1 ++#are.you.sure.on.reload=1 ++#save.on.timer=20 ++#reload.preserves.undo=1 ++#check.if.already.open=1 ++#temp.files.sync.load=1 ++default.file.ext=.cxx ++#source.default.extensions=.h|.cxx|.bat ++title.full.path=1 ++#title.show.buffers=1 ++#pathbar.visible=1 ++#pathbar.selectable=1 ++save.recent=1 ++save.session=1 ++#session.bookmarks=1 ++#session.folds=1 ++#save.position=1 ++#save.find=1 ++#open.dialog.in.file.directory=1 ++#strip.trailing.spaces=1 ++#ensure.final.line.end=1 ++#ensure.consistent.line.ends=1 ++#save.deletes.first=1 ++#save.check.modified.time=1 ++buffers=100 ++#buffers.zorder.switching=1 ++#api.*.cxx=d:\api\w.api ++#locale.properties=locale.de.properties ++#translation.missing=*** ++#read.only=1 ++#read.only.indicator=1 ++#background.open.size=20000 ++#background.save.size=20000 ++if PLAT_GTK ++ background.save.size=10000000 ++#max.file.size=1 ++file.size.large=100000000 ++file.size.no.styles=10000000 ++#lexilla.path=. ++ ++# Indentation ++tabsize=8 ++indent.size=8 ++use.tabs=1 ++#indent.auto=1 ++indent.automatic=1 ++indent.opening=0 ++indent.closing=0 ++#tab.indents=0 ++#backspace.unindents=0 ++ ++# Wrapping of long lines ++wrap=1 ++wrap.style= ++#cache.layout=3 ++#output.wrap=1 ++#output.cache.layout=3 ++threads.layout=16 ++#wrap.visual.flags=3 ++#wrap.visual.flags.location=3 ++#wrap.indent.mode=1 ++#wrap.visual.startindent=4 ++ ++#idle.styling=1 ++#output.idle.styling=1 ++ ++# Folding ++# enable folding, and show lines below when collapsed. ++fold=1 ++fold.compact=1 ++fold.flags=16 ++#fold.line.colour=#80800080 ++fold.symbols=1 ++#fold.fore=#000000 ++#fold.back=#808080 ++#fold.highlight=1 ++#fold.highlight.colour=#00C0C0 ++#fold.stroke.width=200 ++#fold.on.open=1 ++fold.comment=1 ++fold.preprocessor=1 ++ ++# Find and Replace ++# Internal search always available with recursive capability so use in preference to external tool ++find.command= ++# findstr is available on recent versions of Windows including 2000 ++#if PLAT_WIN ++# find.command=findstr /n /s $(find.what) $(find.files) ++#find.input=$(find.what) ++#if PLAT_GTK ++# find.command=grep --line-number "$(find.what)" $(find.files) ++find.files=*.c *.cxx *.h ++#find.in.files.close.on.find=0 ++#find.in.dot=1 ++#find.in.binary=1 ++#find.exclude=*.bak *.orig debug ++#find.in.directory= ++#find.close.on.find=0 ++#find.replace.matchcase=1 ++#find.replace.escapes=1 ++#find.replace.regexp=1 ++#find.replace.regexp.posix=1 ++#find.replace.regexp.cpp11=1 ++#find.replace.wrap=0 ++#find.replacewith.focus=0 ++#find.replace.advanced=1 ++find.use.strip=1 ++#find.strip.incremental=1 ++#find.indicator.incremental=style:compositionthick,colour:#FFB700,under ++replace.use.strip=1 ++#replace.strip.incremental=1 ++#strip.button.height=24 ++#strip.shortcuts.enable=0 ++ ++# Behaviour ++#eol.mode=LF ++eol.auto=1 ++clear.before.execute=0 ++#vc.home.key=1 ++#wrap.aware.home.end.keys=1 ++#autocompleteword.automatic=1 ++#autocomplete.choose.single=1 ++#autocomplete.*.fillups=([ ++#autocomplete.*.start.characters=.: ++#autocomplete.*.typesep=! ++#autocomplete.fore=#80FFA0 ++#autocomplete.back=#000000 ++#autocomplete.selected.fore=#00FF40 ++#autocomplete.selected.back=#006040 ++#autocomplete.visible.item.count=15 ++ ++caret.policy.xslop=1 ++caret.policy.width=20 ++caret.policy.xstrict=0 ++caret.policy.xeven=0 ++caret.policy.xjumps=0 ++caret.policy.yslop=1 ++caret.policy.lines=1 ++caret.policy.ystrict=1 ++caret.policy.yeven=1 ++caret.policy.yjumps=0 ++#visible.policy.strict=1 ++#visible.policy.slop=1 ++#visible.policy.lines=4 ++#time.commands=1 ++#caret.sticky=1 ++#properties.directory.enable=1 ++#editor.config.enable=1 ++#save.path.suggestion=$(SciteUserHome)\note_$(TimeStamp).txt ++ ++# Status Bar ++statusbar.number=4 ++statusbar.text.1=\ ++li=$(LineNumber) co=$(ColumnNumber) $(OverType) ($(EOLMode)) $(FileAttr) ++statusbar.text.2=\ ++$(BufferLength) chars in $(NbOfLines) lines. Sel: $(SelLength) chars. ++statusbar.text.3=\ ++Now is: Date=$(CurrentDate) Time=$(CurrentTime) ++statusbar.text.4=\ ++$(FileNameExt) : $(FileDate) - $(FileTime) | $(FileAttr) ++ ++if PLAT_WIN ++ command.scite.help="file://$(SciteDefaultHome)\SciTEDoc.html" ++ command.scite.help.subsystem=2 ++if PLAT_GTK ++ command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html" ++ ++# Internationalisation ++# Japanese input code page 932 and ShiftJIS character set 128 ++#code.page=932 ++#character.set=128 ++# Unicode ++code.page=65001 ++#character.set=204 ++#command.discover.properties=python /home/user/FileDetect.py "$(FilePath)" ++# Forward LC_CTYPE to setlocale which may affect language support. ++#LC_CTYPE=en_US.UTF-8 ++if PLAT_GTK ++ output.code.page=65001 ++if PLAT_MAC ++ output.code.page=65001 ++#ime.interaction=1 ++#ime.autocomplete=1 ++#accessibility=0 ++ ++# Export ++#export.keep.ext=1 ++export.html.wysiwyg=1 ++#export.html.tabs=1 ++#export.html.folding=1 ++export.html.styleused=1 ++#export.html.title.fullpath=1 ++#export.rtf.tabs=1 ++#export.rtf.font.face=Arial ++#export.rtf.font.size=9 ++#export.rtf.tabsize=8 ++#export.rtf.wysiwyg=0 ++#export.tex.title.fullpath=1 ++# Magnification (added to default screen font size) ++export.pdf.magnification=0 ++# Font: Courier, Helvetica or Times (Courier line-wraps) ++export.pdf.font=Helvetica ++# Page size (in points): width, height ++# E.g. Letter 612,792; A4 595,842; maximum 14400,14400 ++export.pdf.pagesize=595,842 ++# Margins (in points): left, right, top, bottom ++export.pdf.margins=72,72,72,72 ++export.xml.collapse.spaces=1 ++export.xml.collapse.lines=1 ++ ++# Define values for use in the imported properties files ++chars.alpha=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ++chars.numeric=0123456789 ++chars.accented=ŠšŒœŸÿÀàÁáÂâÃãÄäÅåÆæÇçÈèÉéÊêËëÌìÍíÎîÏïÐðÑñÒòÓóÔôÕõÖØøÙùÚúÛûÜüÝýÞþßö ++# This is a better set for Russian: ++#chars.accented=ÀàÁáÂâÃãÄäÅ娸ÆæÇçÈèÉéÊêËëÌìÍíÎîÏïÐðÑñÒòÓóÔôÕõÖö×÷ØøÙùÚúÛûÜüÝýÞþßÿ ++ ++# The open.filter setting is used in the file selector which has a menu of filters to apply ++# to the types of files seen when opening. ++ ++# Gather all settings with "*source.patterns." prefix from all active .properties files ++source.files=$(star *source.patterns.) ++source.all.filter=All Source|$(source.files)| ++ ++# Each platform has a different idea of the most important filters ++if PLAT_WIN ++ all.files=All Files (*.*)|*.*| ++ top.filters=$(source.all.filter)$(all.files) ++if PLAT_GTK ++ all.files=All Files (*)|*|Hidden Files (.*)|.*| ++ top.filters=$(all.files)$(source.all.filter) ++# As macOS only greys out filtered files, show all as default ++if PLAT_MAC ++ all.files=All Files (*.*)|*.*| ++ top.filters=$(all.files)$(source.all.filter) ++ ++# Gather all settings with "*filter." prefix from all active .properties files ++list.filters=$(star *filter.) ++ ++open.filter=$(top.filters)$(list.filters) ++ ++#save.filter=$(open.filter) ++ ++# Give symbolic names to the set of fonts used in the standard styles. ++if PLAT_WIN ++ font.base=font:Verdana,size:9.4 ++ font.small=font:Verdana,size:8 ++ font.comment=font:Georgia,size:10.1 ++ font.code.comment.box=$(font.comment) ++ font.code.comment.line=$(font.comment) ++ font.code.comment.doc=$(font.comment) ++ font.code.comment.nested=$(font.comment) ++ font.text=font:Times New Roman,size:11 ++ font.text.comment=font:Verdana,size:9 ++ font.embedded.base=font:Verdana,size:9 ++ font.embedded.comment=font:Comic Sans MS,size:8 ++ font.monospace=font:Consolas,size:8.9 ++ font.monospace.small=font:Consolas,size:8 ++ font.vbs=font:Candara,size:10 ++if PLAT_GTK ++ font.base=font:DejaVu Sans,size:9 ++ font.small=font:DejaVu Sans,size:8 ++ font.comment=font:DejaVu Serif,size:9 ++ font.code.comment.box=$(font.comment) ++ font.code.comment.line=$(font.comment) ++ font.code.comment.doc=$(font.comment) ++ font.code.comment.nested=$(font.comment) ++ font.text=font:DejaVu Serif,size:10 ++ font.text.comment=font:Serif,size:9 ++ font.embedded.base=font:Serif,size:9 ++ font.embedded.comment=font:Serif,size:9 ++ font.monospace=font:DejaVu Sans Mono,size:9 ++ font.monospace.small=font:DejaVu Sans Mono,size:8 ++ font.vbs=font:DejaVu Sans Mono,size:9 ++if PLAT_MAC ++ font.base=font:Verdana,size:12 ++ font.small=font:Verdana,size:10 ++ font.comment=font:Georgia,size:13 ++ font.code.comment.box=$(font.comment) ++ font.code.comment.line=$(font.comment) ++ font.code.comment.doc=$(font.comment) ++ font.code.comment.nested=$(font.comment) ++ font.text=font:Times New Roman,size:13 ++ font.text.comment=font:Verdana,size:11 ++ font.embedded.base=font:Verdana,size:11 ++ font.embedded.comment=font:Comic Sans MS,size:10 ++ font.monospace=font:Menlo,size:12 ++ font.monospace.small=font:Menlo,size:10 ++ font.vbs=font:Lucida Sans Unicode,size:12 ++font.js=$(font.comment) ++font.monospaced.list=Consolas;Courier New;DejaVu Sans Mono;Menlo ++ ++# Give symbolic names to the set of colours used in the standard styles. ++colour.code.comment.box=fore:#007F00 ++colour.code.comment.line=fore:#007F00 ++colour.code.comment.doc=fore:#3F703F ++colour.code.comment.nested=fore:#A0C0A0 ++colour.text.comment=fore:#0000FF,back:#D0F0D0 ++colour.other.comment=fore:#007F00 ++colour.embedded.comment=back:#E0EEFF ++colour.embedded.js=back:#F0F0FF ++colour.notused=back:#FF0000 ++ ++colour.number=fore:#007F7F ++colour.keyword=fore:#00007F ++colour.string=fore:#7F007F ++colour.char=fore:#7F007F ++colour.operator=fore:#000000 ++colour.preproc=fore:#7F7F00 ++colour.error=fore:#FFFF00,back:#FF0000 ++ ++# To de-emphasize inactive code set traits.inactive ++#traits.inactive=,back:#F0F0F0,eolfilled ++traits.inactive= ++ ++# Global default styles for all languages ++# Default ++style.*.32=$(font.base) ++# Line number ++style.*.33=back:#C0C0C0,$(font.base) ++# Brace highlight ++style.*.34=fore:#0000FF,bold ++# Brace incomplete highlight ++style.*.35=fore:#FF0000,bold ++# Control characters ++style.*.36= ++# Indentation guides ++style.*.37=fore:#C0C0C0,back:#FFFFFF ++ ++# Printing ++#print.colour.mode=1 ++print.magnification=-1 ++# Windows-only setup: left, right, top, bottom margins, in local units: ++# hundredths of millimeters or thousandths of inches ++print.margins=1500,1000,1000,1500 ++# Header/footer: ++print.header.format=$(FileNameExt) -- Printed on $(CurrentDate), $(CurrentTime) -- Page $(CurrentPage) ++print.footer.format=$(FilePath) -- File date: $(FileDate) -- File time: $(FileTime) ++# Header/footer style ++print.header.style=font:Arial,size:12,bold ++print.footer.style=font:Arial Narrow,size:10,italics ++ ++# Experimental undocumented settings ++#bidirectional=1 ++ ++# Warnings - only works on Windows and needs to be pointed at files on machine ++#if PLAT_WIN ++# warning.findwrapped=100,E:\Windows\Media\SFX\Boing.wav ++# warning.notfound=0,Effect.wav ++# warning.wrongfile=0,Glass.wav ++# warning.executeok=0,Fanfare.wav ++# warning.executeko=100,GlassBreak.wav ++# warning.nootherbookmark=100,Boing2.wav ++ ++#create.hidden.console=1 ++ ++# Define the Lexer menu, ++# Each item contains three parts: menu string | file extension | key ++# The only keys allowed currently are based on F-keys and alphabetic keys and look like ++# [Ctrl+][Shift+][Fn|a] such as F12 or Ctrl+Shift+D. ++# A '&' may be placed before a letter to be used as an accelerator. This does not work on GTK+. ++ ++keyText=Shift+F11 ++keyMake=Ctrl+Shift+F11 ++keyHTML=F12 ++keyXML=Shift+F12 ++keyIndent=Ctrl+Shift+F12 ++# On macOS, F11 is used by Expose, F12 by Dashbard ++if PLAT_MAC ++ os.x.home.end.keys=1 ++ keyText=Shift+F13 ++ keyMake=Ctrl+Shift+F13 ++ keyHTML=Ctrl+Shift+F14 ++ keyXML=Shift+F14 ++ keyIndent= ++ ++# Gather all settings with "*language." prefix from all active .properties files ++menu.language=$(star *language.) ++ ++# User defined key commands ++user.shortcuts=\ ++Ctrl+Shift+V|IDM_PASTEANDDOWN|\ ++Ctrl+PageUp|IDM_PREVFILE|\ ++Ctrl+PageDown|IDM_NEXTFILE| ++ ++#KeypadPlus|IDM_EXPAND|\ ++#KeypadMinus|IDM_BLOCK_COMMENT| ++ ++#user.context.menu=\ ++#||\ ++#Next File|IDM_NEXTFILE|\ ++#Prev File|IDM_PREVFILE| ++ ++# To keep menus short, these .properties files are not loaded by default. ++imports.exclude=abaqus abbrev ada asl asn1 ave avs baan blitzbasic \ ++bullant caml cil cmake cobol coffeescript csound d dataflex ecl eiffel \ ++Embedded erlang escript flagship forth fortran freebasic fsharp gap \ ++haskell hex kix latex lisp lot lout matlab maxima metapost mmixal \ ++modula3 nim nimrod opal oscript pascal pov powerpro ps purebasic r raku \ ++rebol ruby sas scriptol smalltalk sorcins specman spice tacl tal tex \ ++txt2tags verilog vhdl visualprolog ++# The set of imports allowed can be set with ++#imports.include=ave ++ ++ext.lua.startup.script=$(SciteDefaultHome)/stackrpms.lua ++command.name.8.*=Emit &UTF8 Unicode ++command.subsystem.8.*=3 ++command.8.*=emitUnicode ++command.mode.8.*=savebefore:no ++command.shortcut.8.*=Ctrl+U ++command.name.9.*=Insert &Date AH ++command.subsystem.9.*=3 ++command.9.*=InsertDateAH ++command.mode.9.*=savebefore:no ++command.shortcut.9.*=F5 ++command.name.10.*=Insert Date iso8601 ++command.subsystem.10.*=3 ++command.10.*=InsertDateIso ++command.mode.10.*=savebefore:no ++command.shortcut.10.*=Shift+F5 ++ ++# Import all the language specific properties files in this directory ++import * ++ ++# bgstack15 improvements, in addition to a few sprinkled above. ++font.base=$(font.monospace) ++font.small=$(font.monospace) ++font.comment=$(font.monospace) ++font.text=$(font.monospace) ++font.text.comment=$(font.monospace) ++font.embedded.base=$(font.monospace) ++font.embedded.comment=$(font.monospace) ++font.vbs=$(font.monospace) +diff -x '.*.swp' -Naur salsa/scite/debian/scite+stackrpms.dsc stackrpms/scite/debian/scite+stackrpms.dsc +--- salsa/scite/debian/scite+stackrpms.dsc 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/scite+stackrpms.dsc 2024-08-23 09:42:35.953637267 -0400 +@@ -0,0 +1,17 @@ ++Format: 3.0 (quilt) ++Source: scite ++Binary: scite ++Architecture: any ++Version: 1:5.5.2-100+stackrpms ++Maintainer: B. Stack <bgstack15@gmail.com> ++Homepage: https://scintilla.org/SciTE.html ++Standards-Version: 4.7.0 ++Vcs-Browser: https://salsa.debian.org/debian/scite ++Vcs-Git: https://salsa.debian.org/debian/scite.git ++Build-Depends: debhelper-compat (= 13), libgtk-3-dev, libglib2.0-dev, liblua5.4-dev ++Package-List: ++ scite deb editors optional arch=any ++Files: ++ 00000000000000000000000000000000 1 scite.orig.tar.gz ++ 00000000000000000000000000000000 1 scite+stackrpms.debian.tar.xz ++Original-Maintainer: Michael Vogt <mvo@debian.org> +diff -x '.*.swp' -Naur salsa/scite/debian/_service stackrpms/scite/debian/_service +--- salsa/scite/debian/_service 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/_service 2024-08-23 09:42:49.497637267 -0400 +@@ -0,0 +1,24 @@ ++<services> ++ <service name="tar_scm"> ++ <param name="scm">git</param> ++ <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param> ++ <param name="subdir">scite/debian</param> ++ <param name="filename">debian</param> ++ <param name="revision">master</param> ++ <param name="version">_none_</param> ++ </service> ++ <service name="recompress"> ++ <param name="file">*.tar</param> ++ <param name="compression">xz</param> ++ </service> ++ <service name="download_url"> ++ <param name="protocol">https</param> ++ <param name="host">www.scintilla.org</param> ++ <param name="path">scite552.tgz</param> ++ <param name="filename">scite_5.5.2.orig.tar.gz</param> ++ </service> ++ <service name="extract_file"> ++ <param name="archive">*.tar.xz</param> ++ <param name="files">*/*.dsc</param> ++ </service> ++</services> +diff -x '.*.swp' -Naur salsa/scite/debian/source/lintian-overrides stackrpms/scite/debian/source/lintian-overrides +--- salsa/scite/debian/source/lintian-overrides 2024-05-01 20:16:52.117804014 -0400 ++++ stackrpms/scite/debian/source/lintian-overrides 2024-05-01 20:27:00.470504688 -0400 +@@ -3,3 +3,7 @@ + scite source: source-is-missing [scite/doc/ScriptLexer.html] + scite source: source-is-missing [scintilla/doc/SciCoding.html] + scite source: source-is-missing [lexilla/test/examples/hypertext/mako.html] ++# stackrpms,4 ++national-encoding debian/SciTEGlobal.properties ++invalid-field-for-derivative ++invalid-devuan-version +diff -x '.*.swp' -Naur salsa/scite/debian/stackrpms.lua stackrpms/scite/debian/stackrpms.lua +--- salsa/scite/debian/stackrpms.lua 1969-12-31 19:00:00.000000000 -0500 ++++ stackrpms/scite/debian/stackrpms.lua 2024-07-20 09:10:34.708207055 -0400 +@@ -0,0 +1,279 @@ ++-- DESCRIPTION: ++-- Unicode hexadecimal table: https://example.com/copied/unicode.html ++-- Source: http://lua-users.org/wiki/SciteUnicodeInput http://sourceforge.net/projects/emitunicodeinscite/ ++-- Future reference: http://lua-users.org/wiki/SciteScripts ++-- ++-- This lua script adds utf8 unicode input, to the scite text editor. ++-- ++-- The scite text editor should be set to use the UTF-8 encoding ++-- , because this script adds utf8, into the text buffer of the ++-- scite editor. Select File->Encoding->UTF-8, from the ++-- menu bar of scite. ++-- ++-- For example, it will be possible that you type 2200 CTRL+U ++-- , and 2200 is replaced to ∀; (U+2200), in the scite editor. ++-- ++-- ______________________________________________________________________________ ++-- ++-- INSTALL: ++-- ++-- To have scite running this script each time you press Ctrl+U, add next lines ++-- into your ~/SciTEUser.properties file, where ~ is your home directory. ++-- FILE ~/SciTEUser.properties: ++--[[ ++ext.lua.startup.script=$(SciteUserHome)/emitUtf8UnicodeIntoTheSciteEditor.lua ++command.name.8.*=Emit UTF8 Unicode ++command.subsystem.8.*=3 ++command.8.*=emitUtf8UnicodeIntoTheSciteEditor ++command.mode.8.*=savebefore:no ++command.shortcut.8.*=Ctrl+U ++--]] ++-- ______________________________________________________________________________ ++-- THE LUA CODE: ++-- ++-- Next is the definition of the lua function that is called by scite ++-- when CTRL+U is pressed, to replace unicode endpoint encoding, with ++-- utf8 encoding of the unicode endpoint. ++-- ______________________________________________________________________________ ++ ++ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0 <= u <= 0x7f ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case1UnicodeToUtf8(unicodeValue) ++ --print('case 1') ++ local u = unicodeValue ++ local byte0 = (u % 0x80) ++ local utf8 = string.char(byte0) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0x80 <= u <= 0x7ff ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case2UnicodeToUtf8(unicodeValue) ++ --print('case 2') ++ local u = unicodeValue ++ local byte1 = (0x80 + (u % 0x40) ) ++ u = math.floor(u / 0x40) ++ local byte0 = (0xc0 + (u % 0x20) ) ++ local utf8 = string.char(byte0, byte1) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0x800 <= u <= 0xffff. ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case3UnicodeToUtf8(unicodeValue) ++ local u = unicodeValue ++ local byte2 = (0x80 + (u % 0x40)) ++ -- print('byte2: '..byte2) ++ u = math.floor(u / 0x40) ++ local byte1 = (0x80 + (u % 0x40)) ++ -- print('byte1: '..byte1) ++ u = math.floor(u / 0x40) ++ local byte0 = (0xe0 + (u % 0x10)) ++ -- print('byte0: '..byte0) ++ local utf8 = string.char(byte0, byte1, byte2) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Computes the utf8 encoding for a unicode codepoint u ++-- , when 0x10000 <= u <= 0x10ffff. ++-- ++-- @param unicodeValue the unicode codepoint u ++-- ++-- @return the utf8 encoding of the unicode codepoint u ++function case4UnicodeToUtf8(unicodeValue) ++ local u = unicodeValue ++ local byte3 = (0x80 + (u % 0x40)) ++ u = math.floor(u / 0x40) ++ local byte2 = (0x80 + (u % 0x40)) ++ u = math.floor(u / 0x40) ++ local byte1 = (0x80 + (u % 0x40)) ++ u = math.floor(u / 0x40) ++ local byte0 = (0xf0 + (u % 0x8)) ++ local utf8 = string.char(byte0, byte1, byte2, byte3) ++ return utf8 ++end ++ ++-- ______________________________________________________________________________ ++-- Converts a unicode integer value, into a utf8 string value. ++-- ++-- The unicode integer value is an integer that ++-- is greater than or equal to zero. ++-- ++-- The utf8 string value is a string that is a sequence of ++-- 8 bits characters that give the utf8 encoding of the ++-- unicode codepoint given by the unicode integer value. ++-- ++-- @param unicodeValue the unicode integer value; ++-- a unicode codepoint ++-- ++-- @return the utf8 encoding of the unicode codepoint ++-- provided by the unicodeValue input argument ++function unicodeToUtf8(unicodeValue) ++ local u = unicodeValue ++ if ((0x800 <= u) and (0xffff >= u)) ++ then ++ return case3UnicodeToUtf8(u) ++ end ++ if ((0x80 <= u) and (0x7fff >= u)) ++ then ++ return case2UnicodeToUtf8(u) ++ end ++ if ((0x0 <= u) and (0x7f >= u)) ++ then ++ return case1UnicodeToUtf8(u) ++ end ++ if( (0x10000 <= u) and (0x10ffff >= u) ) ++ then ++ return case4UnicodeToUtf8(u) ++ end ++ return nil ++end ++ ++-- ______________________________________________________________________________ ++-- Peeks (reads) the character at position i, in the Scite Editor. ++-- If the character is the ascii name of a hex digit, it returns ++-- the corresponding hex digit, otherwise it returns nil. ++-- ++-- @param i position in the Scite Editor ++-- @return hex digit at position i, or nil ++function peekHexdigit(i) ++ local e = editor ++ local asciiCode = e.CharAt[i] ++ if((0>asciiCode) or (0xff < asciiCode)) ++ then ++ return nil ++ end ++ local charValue = string.char(asciiCode) ++ local hexDigit = tonumber(charValue,0x10) ++ return hexDigit -- may be nil ++end ++ ++-- ______________________________________________________________________________ ++-- Reads the sequence of maximum length at most 5, at the left of the cursor ++-- in the Scite Editor. ++-- Encodes the longest suffix of this sequence, that is a hex number, into ++-- the utf encoding of this hex number. ++-- Replaces this longest suffix, with the utf8 sequence. ++-- ++-- @return true a suffix of length greater than zero, at most 5 existed ++-- and was replaced with the utf8 encoding of the number it ++-- represented ++-- ++-- false , when no such suffix existed ++function emitUtf8Unicode() ++ local e = editor ++ local n = e.TextLength ++ local i = e.CurrentPos ++ local maxlen = 5 ++ if ((0 == n) or (1 > i)) ++ then ++ return nil -- Success. No request ++ end ++ local len = 1 ++ local len2 = 0 ++ local u = 0 ++ local thePower = 1 ++ while ( (len <= maxlen) ++ and (0 <= (i - len) ) ++ ) ++ do ++ local hexDigit = peekHexdigit(i-len,u) ++ if (nil == hexDigit) ++ then ++ break -- out of the while loop ++ end ++ u = ( u + (thePower * hexDigit) ) ++ thePower = (0x10 * thePower ) ++ len2 = len ++ --print("u: "..u) ++ len = len + 1 ++ end ++ if (0 == len2) ++ then ++ return nil -- Failure. No unicode ++ end ++ utf8 = unicodeToUtf8(u) ++ if(nil == utf8) ++ then ++ return nil -- Failure. Unicode to utf8 conversion failed. ++ end ++ e:SetSel(i-len2,i) ++ e:ReplaceSel(utf8) ++ --print("utf8: "..utf8) ++ return true -- Success. ++end ++ ++-- ______________________________________________________________________________ ++-- Emits utf8 encoding in the place of the unicode codepoint ++-- in the editor, at the left of the cursor. ++-- ++-- Writes a message to the Output pane, if no codepoint existed ++-- at the left of the cursor. ++-- ++function emitUnicode() ++ local ok = emitUtf8Unicode() ++ if not ok ++ then ++ --print("Failed to encode unicode into text editor.") ++ end ++end ++ ++-- ______________________________________________________________________________ ++-- ++-- Following web pages were useful in writing the lua scite script. ++-- ++-- http://lua-users.org/wiki/UsingLuaWithScite ++-- http://www.scintilla.org/PaneAPI.html ++-- http://www.lua.org/manual/5.1/manual.html#pdf-tonumber ++-- https://en.wikipedia.org/wiki/UTF-8 ++-- ++-- http://lua-users.org/lists/lua-l/2007-08/msg00276.html ++-- http://keplerproject.github.io/luadoc/ ++ ++-- Reference: http://lua-users.org/wiki/SciteInsertDate ++-- Tags used by os.date: ++-- %a abbreviated weekday name (e.g., Wed) ++-- %A full weekday name (e.g., Wednesday) ++-- %b abbreviated month name (e.g., Sep) ++-- %B full month name (e.g., September) ++-- %c date and time (e.g., 09/16/98 23:48:10) ++-- %d day of the month (16) [01-31] ++-- %H hour, using a 24-hour clock (23) [00-23] ++-- %I hour, using a 12-hour clock (11) [01-12] ++-- %M minute (48) [00-59] ++-- %m month (09) [01-12] ++-- %p either "am" or "pm" (pm) ++-- %S second (10) [00-61] ++-- %w weekday (3) [0-6 = Sunday-Saturday] ++-- %x date (e.g., 09/16/98) ++-- %X time (e.g., 23:48:10) ++-- %Y full year (1998) ++-- %y two-digit year (98) [00-99] ++-- %% the character '%' ++-- Last modified 2024-07-20-7 09:10 ++function InsertDateAH() ++ local dow = tostring(math.floor(os.date("%w") + 1)) ++ local d1 = os.date("%Y-%m-%d-") ++ local d2 = os.date(" %H:%M") ++ editor:ReplaceSel(d1..dow..d2) ++end ++function InsertDateIso() ++ local date_string = os.date("%Y-%m-%dT%T") ++ editor:ReplaceSel(date_string) ++end diff --git a/veracrypt/README.md b/veracrypt/README.md index de20d12..39fd74b 100644 --- a/veracrypt/README.md +++ b/veracrypt/README.md @@ -2,10 +2,10 @@ https://www.veracrypt.fr/code/VeraCrypt/snapshot/VeraCrypt_1.24.tar.gz https://gitlab.com/bgstack15/big-sources/raw/master/veracrypt/VeraCrypt_1.24.tar.gz Rpm spec forked from [scx copr](https://copr-be.cloud.fedoraproject.org/results/scx/veracrypt/fedora-27-x86_64/00657099-veracrypt/veracrypt.spec which also provides) which also provides the GTK2/3 options -My dpkg is now an overlay on top of [Unit193 on salsa](https://salsa.debian.org/debian-edu-pkg-team/veracrypt) +My dpkg is now an overlay on top of [Unit193 on salsa](https://salsa.debian.org/debian-edu-pkg-team/veracrypt) which is also at his [cgit](https://git.unit193.net/cgit/veracrypt.git) # Reason for being in stackrpms -Fedora does not package veracrypt because its license is tricky. Devuan does not package the application either. +Fedora does not package veracrypt because its license is tricky. Devuan does not package the application either. I want to compile this myself, and also I don't need some of the systemd features in the unit193 debianized package anyways. # Alternatives * pmdpalma @@ -18,7 +18,7 @@ Fedora does not package veracrypt because its license is tricky. Devuan does not # Reverse dependency matrix Distro | VeraCrypt version ---------- | ----------------- -All | 1.24 +Devuan | 1.26.14 # Differences from upstream ##Dpkg diff --git a/veracrypt/debian/_service b/veracrypt/debian/_service index f35bf13..cf97edb 100644 --- a/veracrypt/debian/_service +++ b/veracrypt/debian/_service @@ -14,7 +14,7 @@ <service name="tar_scm"> <param name="scm">git</param> <param name="url">https://github.com/veracrypt/VeraCrypt.git</param> - <param name="revision">VeraCrypt_1.26.7</param> + <param name="revision">VeraCrypt_1.26.14</param> <param name="version">_none_</param> </service> <service name="recompress"> diff --git a/veracrypt/debian/changelog b/veracrypt/debian/changelog index ce42bbd..89faafa 100644 --- a/veracrypt/debian/changelog +++ b/veracrypt/debian/changelog @@ -1,3 +1,27 @@ +veracrypt (1.26.14-1+stackrpms) obs; urgency=low + + * All OSes: + * Update translations and documentation + * Implement language selection settings in non-Windows versions. + * Make codebase compatible with wxWidgets 3.3 in non-Windows versions. + * Implement detection of volumes affected by XTS master key + vulnerability and warn user about it. + * Update mount failure error messages to mention removal of TrueCrypt + support and old algorithms. + * Linux: + * Focus PIM field when selected (#1239) + * Fix generic installation script on Konsole in Wayland (#1244) + * Added the ability to build using wolfCrypt as the cryptographic + backend. Disabled by default. (Contributed by wolfSSL, GH PR #1227) + * Allows GUI to launch in a Wayland-only environment (GH #1264) + * CLI: Don't initially re-ask PIM if it was already specified (GH #1288) + * CLI: Fix incorrect max hidden volume size for file containers (GH + #1338)) + * Enhance ASLR security of generic installer binaries by adding linked + flag for old GCC version (reported by @morton-f on Sourceforge) + + -- B. Stack <bgstack15@gmail.com> Tue, 03 Sep 2024 11:09:24 -0400 + veracrypt (1.26.7-1+stackrpms) obs; urgency=low * All OSes: diff --git a/veracrypt/debian/control b/veracrypt/debian/control index 0b08c8a..77d08e4 100644 --- a/veracrypt/debian/control +++ b/veracrypt/debian/control @@ -2,12 +2,12 @@ Source: veracrypt Section: non-free/utils Priority: optional Maintainer: B. Stack <bgstack15@gmail.com> -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), libayatana-appindicator3-dev | libappindicator3-dev, libfuse3-dev, libpcsclite-dev, libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev, - pkg-config, + pkgconf, yasm [any-i386 any-amd64] Rules-Requires-Root: no Standards-Version: 4.6.0 diff --git a/veracrypt/debian/patches/1001-port-to-libfuse3.patch b/veracrypt/debian/patches/1001-port-to-libfuse3.patch index 5f2860e..d0b9565 100644 --- a/veracrypt/debian/patches/1001-port-to-libfuse3.patch +++ b/veracrypt/debian/patches/1001-port-to-libfuse3.patch @@ -3,32 +3,21 @@ From: Unit 193 <unit193@unit193.net> Forwarded: https://github.com/veracrypt/VeraCrypt/issues/528 --- - src/Driver/Fuse/Driver.make | 2 +- src/Driver/Fuse/FuseService.cpp | 26 +++++++++----------------- - src/Main/Main.make | 2 +- - 3 files changed, 11 insertions(+), 19 deletions(-) + src/Makefile | 2 +- + 2 files changed, 10 insertions(+), 18 deletions(-) ---- a/src/Main/Main.make -+++ b/src/Main/Main.make -@@ -102,7 +102,7 @@ endif +--- a/src/Makefile ++++ b/src/Makefile +@@ -52,7 +52,7 @@ export LFLAGS := - #------ FUSE configuration ------ + export PKG_CONFIG ?= pkg-config + export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig +-export VC_FUSE_PACKAGE := fuse ++export VC_FUSE_PACKAGE := fuse3 + export VC_OSX_FUSET ?= 0 --FUSE_LIBS = $(shell $(PKG_CONFIG) fuse --libs) -+FUSE_LIBS = $(shell $(PKG_CONFIG) fuse3 --libs) - - #------ Executable ------ - ---- a/src/Driver/Fuse/Driver.make -+++ b/src/Driver/Fuse/Driver.make -@@ -15,6 +15,6 @@ NAME := Driver - OBJS := - OBJS += FuseService.o - --CXXFLAGS += $(shell $(PKG_CONFIG) fuse --cflags) -+CXXFLAGS += $(shell $(PKG_CONFIG) fuse3 --cflags) - - include $(BUILD_INC)/Makefile.inc + export WX_CONFIG ?= wx-config --- a/src/Driver/Fuse/FuseService.cpp +++ b/src/Driver/Fuse/FuseService.cpp @@ -13,7 +13,7 @@ diff --git a/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch b/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch deleted file mode 100644 index 9cd566f..0000000 --- a/veracrypt/debian/patches/1002-fix-ftbfs-32bit.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bd843ffa05147aab80e38ee668b0556302d2bfc9 Mon Sep 17 00:00:00 2001 -From: Mounir IDRASSI <mounir.idrassi@idrix.fr> -Date: Mon, 2 Oct 2023 18:02:33 +0200 -Subject: [PATCH] Linux: Fix compilation error on some 32-bit machines. - ---- - src/Common/PCSCException.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/Common/PCSCException.cpp b/src/Common/PCSCException.cpp -index 93fff18187..dc5eead323 100644 ---- a/src/Common/PCSCException.cpp -+++ b/src/Common/PCSCException.cpp -@@ -140,14 +140,17 @@ namespace VeraCrypt - { - Exception::Deserialize(stream); - Serializer sr(stream); -- sr.Deserialize("ErrorCode", ErrorCode); -+ int64 v; -+ sr.Deserialize("ErrorCode", v); -+ ErrorCode = (LONG_PCSC)v; - } - - void PCSCException::Serialize(shared_ptr <Stream> stream) const - { - Exception::Serialize(stream); - Serializer sr(stream); -- sr.Serialize("ErrorCode", ErrorCode); -+ int64 v = (int64)ErrorCode; -+ sr.Serialize("ErrorCode", v); - } - - # define TC_EXCEPTION(TYPE) TC_SERIALIZER_FACTORY_ADD(TYPE) diff --git a/veracrypt/debian/patches/series b/veracrypt/debian/patches/series index 831301f..8518785 100644 --- a/veracrypt/debian/patches/series +++ b/veracrypt/debian/patches/series @@ -1,3 +1,2 @@ 1001-port-to-libfuse3.patch -1002-fix-ftbfs-32bit.patch vc_devuan.patch diff --git a/veracrypt/debian/patches/vc_devuan.patch b/veracrypt/debian/patches/vc_devuan.patch index 386e777..b55dbaf 100644 --- a/veracrypt/debian/patches/vc_devuan.patch +++ b/veracrypt/debian/patches/vc_devuan.patch @@ -1,10 +1,11 @@ -Version: 1.26.7 -Date: 2023-10-03 +Version: 1.26.14 +Date: 2024-09-03 +Message: Change distributor name --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -2171,7 +2171,7 @@ BOOL CALLBACK AboutDlgProc (HWND hwndDlg L"This software as a whole:\r\n" - L"Copyright \xA9 2013-2023 IDRIX. All rights reserved.\r\n\r\n" + L"Copyright \xA9 2013-2024 IDRIX. All rights reserved.\r\n\r\n" - L"An IDRIX Release"); + L"Packaged for Devuan"); @@ -13,7 +14,7 @@ Date: 2023-10-03 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h -@@ -447,7 +447,7 @@ void EraseMemory (void *memory, int size +@@ -451,7 +451,7 @@ void EraseMemory (void *memory, int size #define TC_MAX_PATH 260 /* Includes the null terminator */ #endif @@ -24,7 +25,7 @@ Date: 2023-10-03 --- a/src/Main/Forms/AboutDialog.cpp +++ b/src/Main/Forms/AboutDialog.cpp -@@ -74,6 +74,6 @@ namespace VeraCrypt +@@ -78,6 +78,6 @@ namespace VeraCrypt L"This software uses wxWidgets library, which is copyright \xA9 1998-2011 Julian Smart, Robert Roebling et al.\n\n" diff --git a/veracrypt/debian/rules b/veracrypt/debian/rules index 6b929d1..f0b4bac 100755 --- a/veracrypt/debian/rules +++ b/veracrypt/debian/rules @@ -17,7 +17,7 @@ export TC_EXTRA_LFLAGS = $(LDFLAGS) override_dh_auto_build: dh_auto_build -- ARCH=$(DEB_HOST_ARCH) INDICATOR=1 NOSTRIP=1 VERBOSE=1 - unset DISPLAY && src/Main/veracrypt --text --help 2>/dev/null | perl debian/veracrypt_help_to_troff.pl > veracrypt.1 + unset DISPLAY && src/Main/veracrypt --text --help 2>/dev/null | debian/veracrypt_help_to_troff.pl > veracrypt.1 override_dh_clean: dh_clean veracrypt.1 diff --git a/veracrypt/debian/veracrypt+stackrpms.dsc b/veracrypt/debian/veracrypt+stackrpms.dsc index 10bdbf7..a0f747d 100644 --- a/veracrypt/debian/veracrypt+stackrpms.dsc +++ b/veracrypt/debian/veracrypt+stackrpms.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: veracrypt Binary: veracrypt Architecture: any -Version: 1.26.7-1+stackrpms +Version: 1.26.14-1+stackrpms Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://veracrypt.fr/ Standards-Version: 4.6.0 -Build-Depends: debhelper-compat (= 12), libayatana-appindicator3-dev | libappindicator3-dev, libfuse3-dev, libpcsclite-dev, libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev, pkg-config, yasm [any-i386 any-amd64] +Build-Depends: debhelper-compat (= 12), libayatana-appindicator3-dev | libappindicator3-dev, libfuse3-dev, libpcsclite-dev, libwxgtk3.2-dev | libwxgtk3.0-gtk3-dev, pkgconf, yasm [any-i386 any-amd64] Package-List: veracrypt deb non-free/utils optional arch=any Files: diff --git a/xdgmenumaker/debian/_service b/xdgmenumaker/debian/_service index b7362db..d8d008b 100644 --- a/xdgmenumaker/debian/_service +++ b/xdgmenumaker/debian/_service @@ -1,10 +1,10 @@ <services> <service name="tar_scm"> <param name="scm">git</param> - <param name="url">https://gitlab.com/bgstack15/stackrpms.git</param> + <param name="url">https://bgstack15.ddns.net/cgit/stackrpms</param> <param name="subdir">xdgmenumaker/debian</param> <param name="filename">debian</param> - <param name="revision">fix-deb-suffix</param> + <param name="revision">master</param> <param name="version">_none_</param> </service> <service name="recompress"> @@ -14,7 +14,7 @@ <service name="tar_scm"> <param name="scm">git</param> <param name="url">https://github.com/gapan/xdgmenumaker.git</param> - <param name="revision">2.0</param> + <param name="revision">2.3</param> <param name="version">_none_</param> </service> <service name="recompress"> diff --git a/xdgmenumaker/debian/changelog b/xdgmenumaker/debian/changelog index 6060db1..b621e3a 100644 --- a/xdgmenumaker/debian/changelog +++ b/xdgmenumaker/debian/changelog @@ -1,3 +1,10 @@ +xdgmenumaker (2.3-1+stackrpms) obs; urgency=low + + * New upstream version + * Fix desktop file + + -- B. Stack <bgstack15@gmail.com> Wed, 14 Aug 2024 23:06:41 -0400 + xdgmenumaker (2.0-2+stackrpms) obs; urgency=low * Fix version suffix diff --git a/xdgmenumaker/debian/xdgmenumaker+stackrpms.dsc b/xdgmenumaker/debian/xdgmenumaker+stackrpms.dsc index fb41623..3853b4e 100644 --- a/xdgmenumaker/debian/xdgmenumaker+stackrpms.dsc +++ b/xdgmenumaker/debian/xdgmenumaker+stackrpms.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: xdgmenumaker Binary: xdgmenumaker Architecture: any -Version: 2.0-2+stackrpms +Version: 2.3-1+stackrpms Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://github.com/gapan/xdgmenumaker Standards-Version: 4.1.4 diff --git a/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop index 348f6dc..3c0b219 100644 --- a/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop +++ b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=Settings;DesktopSettings; Comment=Update current user's fluxbox xdg menu -Exec=/usr/bin/xdgmenumaker-user.sh fluxbox +Exec=xdgmenumaker-user fluxbox GenericName=Update xdg menu Icon=xdgmenumaker-user Keywords=menu;xdg; |