Sorry Aaron, they re-did it upstream. Better luck next time with your ninja skills. ;)
Revert "Fix an arch-dependency issue" This reverts commit a38d072d8416719aabe7094f2d2021ad6f1cf95f.
This commit is contained in:
		
							parent
							
								
									a38d072d84
								
							
						
					
					
						commit
						93cfd4d4cf
					
				
							
								
								
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							| @ -1,9 +1,3 @@ | |||||||
| lxqt-menu-data (1.4.0-0ubuntu2) UNRELEASED; urgency=medium |  | ||||||
| 
 |  | ||||||
|   * Make the package arch-independent |  | ||||||
| 
 |  | ||||||
|  -- Aaron Rainbolt <arraybolt3@gmail.com>  Mon, 06 Nov 2023 10:27:06 -0600 |  | ||||||
| 
 |  | ||||||
| lxqt-menu-data (1.4.0-0ubuntu1) noble; urgency=medium | lxqt-menu-data (1.4.0-0ubuntu1) noble; urgency=medium | ||||||
| 
 | 
 | ||||||
|   * Initial release. |   * Initial release. | ||||||
|  | |||||||
							
								
								
									
										22
									
								
								debian/patches/fix-arch-dependence.patch
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										22
									
								
								debian/patches/fix-arch-dependence.patch
									
									
									
									
										vendored
									
									
								
							| @ -1,22 +0,0 @@ | |||||||
| Description: Fix arch-dependence issues |  | ||||||
|  lxqt-menu-data is arch-independent, however the main CMakeLists.txt file |  | ||||||
|  is configured improperly and is generating an arch-dependent config file. |  | ||||||
|  This is causing build failures for users of lxqt-menu-data on 32-bit arches |  | ||||||
|  like armhf. Fix the configuration issue. |  | ||||||
| Author: Aaron Rainbolt <arraybolt3@ubuntu.com> |  | ||||||
| Origin: vendor |  | ||||||
| Bug: https://github.com/lxqt/lxqt-menu-data/issues/17 |  | ||||||
| Forwarded: not-needed |  | ||||||
| Last-Update: 2023-11-06 |  | ||||||
| ---
 |  | ||||||
| This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |  | ||||||
| --- a/CMakeLists.txt
 |  | ||||||
| +++ b/CMakeLists.txt
 |  | ||||||
| @@ -36,6 +36,7 @@ write_basic_package_version_file(
 |  | ||||||
|      "${CMAKE_BINARY_DIR}/${LXQT_MENU_DATA_CMAKE_NAME}-config-version.cmake" |  | ||||||
|      VERSION ${LXQT_MENU_DATA_VERSION} |  | ||||||
|      COMPATIBILITY AnyNewerVersion |  | ||||||
| +    ARCH_INDEPENDENT
 |  | ||||||
|  ) |  | ||||||
|   |  | ||||||
|  install(FILES |  | ||||||
							
								
								
									
										1
									
								
								debian/patches/series
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/patches/series
									
									
									
									
										vendored
									
									
								
							| @ -1 +0,0 @@ | |||||||
| fix-arch-dependence.patch |  | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user