diff --git a/dev-libs/qr-code-generator/qr_code_generator-1.5.0.recipe b/dev-libs/qr-code-generator/qr_code_generator-1.8.0.recipe
similarity index 57%
rename from dev-libs/qr-code-generator/qr_code_generator-1.5.0.recipe
rename to dev-libs/qr-code-generator/qr_code_generator-1.8.0.recipe
index 7e3ec45dd..8f584b1b7 100644
--- a/dev-libs/qr-code-generator/qr_code_generator-1.5.0.recipe
+++ b/dev-libs/qr-code-generator/qr_code_generator-1.8.0.recipe
@@ -20,19 +20,28 @@ SVG XML string (all languages except C), BufferedImage raster bitmap \
 (Java only), HTML5 canvas (JavaScript and TypeScript only)
 * Encodes numeric and special-alphanumeric text in less space than general text
 * Open source code under the permissive MIT License"
-HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library"
-COPYRIGHT="2018-2019 Nayuki"
+HOMEPAGE="https://www.nayuki.io/page/qr-code-generator-library
+	https://github.com/EasyCoding/qrcodegen-cmake"
+COPYRIGHT="2022 Project Nayuki
+	2021-2022 EasyCoding Team and contributors"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/nayuki/QR-Code-generator/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="6cf993c10fbf96b5e8f8e4eaad8ea1ca3bbc58fb4d00a4728b4f818c27fb4d5e"
+CHECKSUM_SHA256="2ec0a4d33d6f521c942eeaf473d42d5fe139abcfa57d2beffe10c5cf7d34ae60"
 SOURCE_DIR="QR-Code-generator-$portVersion"
+SOURCE_URI_2="https://github.com/EasyCoding/qrcodegen-cmake/archive/refs/tags/v1.8.0-cmake1.tar.gz"
+CHECKSUM_SHA256_2="ba64c585ff185c9320beaf2c831b4495a529c5d068dd2bca4ed266a67e3d4924"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	qr_code_generator$secondaryArchSuffix = $portVersion
+	lib:libqrcodegen$secondaryArchSuffix = $libVersionCompat
+	lib:libqrcodegencpp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -40,9 +49,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	qr_code_generator${secondaryArchSuffix}_devel = $portVersion
-	devel:libqrcodegencpp$secondaryArchSuffix = $portVersion
-	devel:libqrcodegen$secondaryArchSuffix = $portVersion
-
+	devel:libqrcodegen$secondaryArchSuffix = $libVersionCompat
+	devel:libqrcodegencpp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	qr_code_generator$secondaryArchSuffix == $portVersion base
@@ -52,28 +60,40 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"
 
+defineDebugInfoPackage qr_code_generator$secondaryArchSuffix \
+	$libDir/libqrcodegen.so.$libVersion \
+	$libDir/libqrcodegencpp.so.$libVersion
+
 BUILD()
 {
-	cd cpp
-	# workaround for cannot find -lubsan
-	sed -i 's,-fsanitize=undefined,,g' Makefile
-	make $jobArgs
+	cp -r $sourceDir2/qrcodegen-cmake-1.8.0-cmake1/{cmake,CMakeLists.txt} $sourceDir
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		$cmakeDirArgs \
+		-DBUILD_SHARED_LIBS=ON \
+		-DBUILD_TESTS=ON
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd cpp
-	mkdir -p $includeDir/qrcodegen
-	cp *.hpp $includeDir/qrcodegen
+	make -C build install
 
-	mkdir -p $developLibDir
-	cp libqrcodegen.a $developLibDir/libqrcodegencpp.a
+	prepareInstalledDevelLibs libqrcodegen libqrcodegencpp
+	fixPkgconfig
 
 	# devel package
-	packageEntries devel $includeDir $developLibDir
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+}
+
+TEST()
+{
+	make -C build test
 }